diff --git a/.all-contributorsrc b/.all-contributorsrc index a95b716565b..9408ce9728a 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -1317,6 +1317,15 @@ "contributions": [ "doc" ] + }, + { + "login": "tmewes", + "name": "Tino Mewes", + "avatar_url": "https://avatars.githubusercontent.com/u/12640514?v=4", + "profile": "https://github.com/tmewes", + "contributions": [ + "code" + ] } ], "contributorsPerLine": 7 diff --git a/README.md b/README.md index 03ec263cdf4..1b8122307a1 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@

-[![All Contributors](https://img.shields.io/badge/all_contributors-145-orange.svg?style=flat-square)](#contributors-) +All Contributors Build Status Total Downloads @@ -341,6 +341,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
lemundo-team
💻
mdlonline
💻
Benjamin MARROT
📖 +
Tino Mewes
💻 diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Created.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Created.php index ecffd3a50d2..089a0d374c9 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Created.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Created.php @@ -77,7 +77,7 @@ public function isEdit() } /** - * Retrive serialized json with configurable attributes values of simple + * Retrieve serialized json with configurable attributes values of simple * * @return string */ @@ -121,7 +121,7 @@ public function getAttributes() } /** - * Retrive configurable product for created/edited simple + * Retrieve configurable product for created/edited simple * * @return Mage_Catalog_Model_Product */ @@ -136,7 +136,7 @@ public function getConfigurableProduct() } /** - * Retrive product + * Retrieve product * * @return Mage_Catalog_Model_Product */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Attributes.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Attributes.php index b66b3fbbd67..163821846bc 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Attributes.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Attributes.php @@ -63,7 +63,7 @@ protected function _prepareForm() } /** - * Retrive attributes for product massupdate + * Retrieve attributes for product massupdate * * @return array */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes/Create.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes/Create.php index f17fc303738..30f3569eb83 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes/Create.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes/Create.php @@ -41,7 +41,7 @@ class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Attributes_Create extends Ma protected $_config = null; /** - * Retrive config of new attribute creation + * Retrieve config of new attribute creation * * @return Varien_Object */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs.php index 895271db6eb..12996374dc1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs.php @@ -193,7 +193,7 @@ protected function _prepareLayout() } /** - * Retrive product object from object if not from registry + * Retrieve product object from object if not from registry * * @return Mage_Catalog_Model_Product */ diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery/Content.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery/Content.php index 994368eb133..8a29d3f3109 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery/Content.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery/Content.php @@ -72,7 +72,7 @@ protected function _prepareLayout() } /** - * Retrive uploader block + * Retrieve uploader block * * @return Mage_Uploader_Block_Multiple */ @@ -82,7 +82,7 @@ public function getUploader() } /** - * Retrive uploader block html + * Retrieve uploader block html * * @return string */ diff --git a/app/code/core/Mage/Adminhtml/Block/Media/Editor.php b/app/code/core/Mage/Adminhtml/Block/Media/Editor.php index 7d9bcd3f103..53e167885b1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Media/Editor.php +++ b/app/code/core/Mage/Adminhtml/Block/Media/Editor.php @@ -116,7 +116,7 @@ public function getResizeButtonHtml() } /** - * Retrive uploader js object name + * Retrieve uploader js object name * * @return string */ @@ -126,7 +126,7 @@ public function getJsObjectName() } /** - * Retrive config json + * Retrieve config json * * @return string */ @@ -136,7 +136,7 @@ public function getConfigJson() } /** - * Retrive config object + * Retrieve config object * * @return Varien_Config */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage.php index 32b6e6ac20d..a47bf3ca0d4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage.php @@ -48,7 +48,7 @@ public function getFormHtml(Varien_Object $entity, $entityType='quote') { } /** - * Retrive items allowed for gift messages. + * Retrieve items allowed for gift messages. * * If no items available return false. * diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage/Form.php index 9a82bf32260..c237c4a1412 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage/Form.php @@ -61,7 +61,7 @@ public function setEntity(Varien_Object $entity) } /** - * Retrive entity for form + * Retrieve entity for form * * @return Varien_Object */ @@ -252,7 +252,7 @@ protected function _initMessage() } /** - * Retrive gift message for entity + * Retrieve gift message for entity * * @return Mage_GiftMessage_Model_Message */ @@ -266,7 +266,7 @@ public function getMessage() } /** - * Retrive real name for field + * Retrieve real name for field * * @param string $name * @return string @@ -277,7 +277,7 @@ protected function _getFieldName($name) } /** - * Retrive real html id for field + * Retrieve real html id for field * * @param string $id * @return string @@ -288,7 +288,7 @@ protected function _getFieldId($id) } /** - * Retrive field html id prefix + * Retrieve field html id prefix * * @return string */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Tracking.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Tracking.php index 28a7913bdd6..5865f11b7b6 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Tracking.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Tracking.php @@ -73,7 +73,7 @@ public function getSubmitUrl() } /** - * Retrive save button html + * Retrieve save button html * * @return string */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Giftmessage.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Giftmessage.php index fdc3c303cf0..ec1403b9b90 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Giftmessage.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Giftmessage.php @@ -84,7 +84,7 @@ protected function _prepareLayout() } /** - * Retrive save button html + * Retrieve save button html * * @return string */ @@ -110,7 +110,7 @@ public function setEntity(Varien_Object $entity) } /** - * Retrive entity for form + * Retrieve entity for form * * @return Varien_Object */ @@ -124,7 +124,7 @@ public function getEntity() } /** - * Retrive default value for giftmessage sender + * Retrieve default value for giftmessage sender * * @return string */ @@ -142,7 +142,7 @@ public function getDefaultSender() } /** - * Retrive default value for giftmessage recipient + * Retrieve default value for giftmessage recipient * * @return string */ @@ -170,7 +170,7 @@ public function getDefaultRecipient() } /** - * Retrive real name for field + * Retrieve real name for field * * @param string $name * @return string @@ -181,7 +181,7 @@ public function getFieldName($name) } /** - * Retrive real html id for field + * Retrieve real html id for field * * @param string $name * @return string @@ -192,7 +192,7 @@ public function getFieldId($id) } /** - * Retrive field html id prefix + * Retrieve field html id prefix * * @return string */ @@ -224,7 +224,7 @@ protected function _initMessage() } /** - * Retrive gift message for entity + * Retrieve gift message for entity * * @return Mage_GiftMessage_Model_Message */ @@ -249,7 +249,7 @@ public function getSaveUrl() } /** - * Retrive block html id + * Retrieve block html id * * @return string */ diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items/Renderer/Default.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items/Renderer/Default.php index f78864be0cf..0afe4b24595 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items/Renderer/Default.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items/Renderer/Default.php @@ -78,7 +78,7 @@ public function canDisplayContainer() protected $_giftMessage = array(); /** - * Retrive default value for giftmessage sender + * Retrieve default value for giftmessage sender * * @deprecated after 1.4.2.0 * @return string @@ -97,7 +97,7 @@ public function getDefaultSender() } /** - * Retrive default value for giftmessage recipient + * Retrieve default value for giftmessage recipient * * @deprecated after 1.4.2.0 * @return string @@ -126,7 +126,7 @@ public function getDefaultRecipient() } /** - * Retrive real name for field + * Retrieve real name for field * * @deprecated after 1.4.2.0 * @param string $name @@ -160,7 +160,7 @@ protected function _initMessage() } /** - * Retrive gift message for entity + * Retrieve gift message for entity * * @deprecated after 1.4.2.0 * @return Mage_GiftMessage_Model_Message @@ -190,7 +190,7 @@ public function getSaveUrl() } /** - * Retrive block html id + * Retrieve block html id * * @deprecated after 1.4.2.0 * @return string diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Tabs.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Tabs.php index 104d82561ad..d58e6af2e82 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Tabs.php @@ -161,7 +161,7 @@ public function addTab($code, $config) } /** - * Retrive tab + * Retrieve tab * * @param string $code * @return Varien_Object diff --git a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit.php index 0691e413844..ccd76f56099 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit.php @@ -271,7 +271,7 @@ public function getDeleteUrl() } /** - * Retrive email template model + * Retrieve email template model * * @return Mage_Core_Model_Email_Template */ diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Grid/Pending.php b/app/code/core/Mage/Adminhtml/Block/Tag/Grid/Pending.php index 29a21a80fef..161382c2ed1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Grid/Pending.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Grid/Pending.php @@ -104,7 +104,7 @@ protected function _prepareColumns() } /** - * Retrives row click URL + * Retrieves row click URL * * @param mixed $row * @return string diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Grid.php b/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Grid.php index 791712f5903..3759ba2df81 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Grid.php @@ -155,7 +155,7 @@ public function getGridUrl() } /** - * Retrives row click URL + * Retrieves row click URL * * @param mixed $row * @return string diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php index e34f0229e3a..dbfccaf7950 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php @@ -1396,7 +1396,7 @@ public function setMassactionIdFilter($idFilter) } /** - * Retrive massaction block name + * Retrieve massaction block name * * @return string */ @@ -1418,7 +1418,7 @@ public function setMassactionBlockName($blockName) } /** - * Retrive massaction block + * Retrieve massaction block * * @return Mage_Adminhtml_Block_Widget_Grid_Massaction_Abstract */ diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item.php index 79bbc58f227..13eef8d893b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item.php @@ -50,7 +50,7 @@ public function setMassaction($massaction) } /** - * Retrive parent massaction block + * Retrieve parent massaction block * * @return Mage_Adminhtml_Block_Widget_Grid_Massaction_Abstract */ @@ -87,7 +87,7 @@ protected function _createFromConfig(array $config) } /** - * Retrive additional action block for this item + * Retrieve additional action block for this item * * @return Mage_Core_Block_Abstract */ @@ -97,7 +97,7 @@ public function getAdditionalActionBlock() } /** - * Retrive additional action block HTML for this item + * Retrieve additional action block HTML for this item * * @return string */ diff --git a/app/code/core/Mage/Adminhtml/Model/Giftmessage/Save.php b/app/code/core/Mage/Adminhtml/Model/Giftmessage/Save.php index b350491efd4..f52716b60da 100644 --- a/app/code/core/Mage/Adminhtml/Model/Giftmessage/Save.php +++ b/app/code/core/Mage/Adminhtml/Model/Giftmessage/Save.php @@ -178,7 +178,7 @@ public function addAllowQuoteItem($item) } /** - * Retrive allowed quote items for gift messages + * Retrieve allowed quote items for gift messages * * @return array */ @@ -192,7 +192,7 @@ public function getAllowQuoteItems() } /** - * Retrive allowed quote items products for gift messages + * Retrieve allowed quote items products for gift messages * * @return array */ @@ -307,7 +307,7 @@ public function importAllowQuoteItemsFromItems($items) } /** - * Retrive mapped type for entity + * Retrieve mapped type for entity * * @param string $type * @return string diff --git a/app/code/core/Mage/Adminhtml/controllers/System/BackupController.php b/app/code/core/Mage/Adminhtml/controllers/System/BackupController.php index 1cfc4d3e19e..ec71d43d4bf 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/BackupController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/BackupController.php @@ -375,7 +375,7 @@ protected function _isAllowed() } /** - * Retrive adminhtml session model + * Retrieve adminhtml session model * * @return Mage_Adminhtml_Model_Session */ diff --git a/app/code/core/Mage/Api/Controller/Action.php b/app/code/core/Mage/Api/Controller/Action.php index cd90c588bfe..4d91eb3cbdc 100644 --- a/app/code/core/Mage/Api/Controller/Action.php +++ b/app/code/core/Mage/Api/Controller/Action.php @@ -45,7 +45,7 @@ public function preDispatch() } /** - * Retrive webservice server + * Retrieve webservice server * * @return Mage_Api_Model_Server */ diff --git a/app/code/core/Mage/Api/Model/Server/Adapter/Interface.php b/app/code/core/Mage/Api/Model/Server/Adapter/Interface.php index 42391b79c56..085da6d39e9 100644 --- a/app/code/core/Mage/Api/Model/Server/Adapter/Interface.php +++ b/app/code/core/Mage/Api/Model/Server/Adapter/Interface.php @@ -42,7 +42,7 @@ interface Mage_Api_Model_Server_Adapter_Interface public function setHandler($handler); /** - * Retrive handler class name for webservice + * Retrieve handler class name for webservice * * @return string */ @@ -57,7 +57,7 @@ public function getHandler(); public function setController(Mage_Api_Controller_Action $controller); /** - * Retrive webservice api controller + * Retrieve webservice api controller * * @return Mage_Api_Controller_Action */ diff --git a/app/code/core/Mage/Api/Model/Server/Adapter/Soap.php b/app/code/core/Mage/Api/Model/Server/Adapter/Soap.php index e906fbe800e..45052665c8d 100644 --- a/app/code/core/Mage/Api/Model/Server/Adapter/Soap.php +++ b/app/code/core/Mage/Api/Model/Server/Adapter/Soap.php @@ -87,7 +87,7 @@ public function setHandler($handler) } /** - * Retrive handler class name for webservice + * Retrieve handler class name for webservice * * @return string */ @@ -109,7 +109,7 @@ public function setController(Mage_Api_Controller_Action $controller) } /** - * Retrive webservice api controller. If no controller have been set - emulate it by the use of Varien_Object + * Retrieve webservice api controller. If no controller have been set - emulate it by the use of Varien_Object * * @return Varien_Object */ diff --git a/app/code/core/Mage/Api/Model/Server/Adapter/Xmlrpc.php b/app/code/core/Mage/Api/Model/Server/Adapter/Xmlrpc.php index b56c4e868aa..abdf9eb453f 100644 --- a/app/code/core/Mage/Api/Model/Server/Adapter/Xmlrpc.php +++ b/app/code/core/Mage/Api/Model/Server/Adapter/Xmlrpc.php @@ -53,7 +53,7 @@ public function setHandler($handler) } /** - * Retrive handler class name for webservice + * Retrieve handler class name for webservice * * @return string */ @@ -75,7 +75,7 @@ public function setController(Mage_Api_Controller_Action $controller) } /** - * Retrive webservice api controller. If no controller have been set - emulate it by the use of Varien_Object + * Retrieve webservice api controller. If no controller have been set - emulate it by the use of Varien_Object * * @return Mage_Api_Controller_Action|Varien_Object */ diff --git a/app/code/core/Mage/Api/Model/Server/Handler/Abstract.php b/app/code/core/Mage/Api/Model/Server/Handler/Abstract.php index 9567b82a0cf..09d13fe9bcb 100644 --- a/app/code/core/Mage/Api/Model/Server/Handler/Abstract.php +++ b/app/code/core/Mage/Api/Model/Server/Handler/Abstract.php @@ -58,7 +58,7 @@ public function handlePhpError($errorCode, $errorMessage, $errorFile) /** - * Retrive webservice session + * Retrieve webservice session * * @return Mage_Api_Model_Session */ @@ -68,7 +68,7 @@ protected function _getSession() } /** - * Retrive webservice configuration + * Retrieve webservice configuration * * @return Mage_Api_Model_Config */ @@ -78,7 +78,7 @@ protected function _getConfig() } /** - * Retrive webservice server + * Retrieve webservice server * * @return Mage_Api_Model_Server */ @@ -147,7 +147,7 @@ protected function _fault($faultName, $resourceName = null, $customMessage = nul } /** - * Retrive webservice fault as array + * Retrieve webservice fault as array * * @param string $faultName * @param string $resourceName diff --git a/app/code/core/Mage/Api/etc/wsdl.xml b/app/code/core/Mage/Api/etc/wsdl.xml index 6b24d0d9a39..49b0a241e4d 100644 --- a/app/code/core/Mage/Api/etc/wsdl.xml +++ b/app/code/core/Mage/Api/etc/wsdl.xml @@ -83,7 +83,7 @@ - Login user and retrive session id + Login user and retrieve session id diff --git a/app/code/core/Mage/Api/etc/wsdl2.xml b/app/code/core/Mage/Api/etc/wsdl2.xml index fd9fe0d5dd3..fae9dc98c8e 100644 --- a/app/code/core/Mage/Api/etc/wsdl2.xml +++ b/app/code/core/Mage/Api/etc/wsdl2.xml @@ -152,7 +152,7 @@ - Login user and retrive session id + Login user and retrieve session id diff --git a/app/code/core/Mage/Api/etc/wsi.xml b/app/code/core/Mage/Api/etc/wsi.xml index 0db28ab2869..62f93bd4697 100644 --- a/app/code/core/Mage/Api/etc/wsi.xml +++ b/app/code/core/Mage/Api/etc/wsi.xml @@ -273,7 +273,7 @@ - Login user and retrive session id + Login user and retrieve session id diff --git a/app/code/core/Mage/Backup/Model/Resource/Db.php b/app/code/core/Mage/Backup/Model/Resource/Db.php index 7a96221f13e..a24b480b737 100644 --- a/app/code/core/Mage/Backup/Model/Resource/Db.php +++ b/app/code/core/Mage/Backup/Model/Resource/Db.php @@ -176,7 +176,7 @@ protected function _quoteRow($tableName, array $row) } /** - * Retrive table partical data SQL insert + * Retrieve table partical data SQL insert * * @param string $tableName * @param int $count diff --git a/app/code/core/Mage/Bundle/Model/Product/Type.php b/app/code/core/Mage/Bundle/Model/Product/Type.php index 0aba1f4be83..5495f85f097 100644 --- a/app/code/core/Mage/Bundle/Model/Product/Type.php +++ b/app/code/core/Mage/Bundle/Model/Product/Type.php @@ -389,7 +389,7 @@ public function getOptionsCollection($product = null) } /** - * Retrive bundle selections collection based on used options + * Retrieve bundle selections collection based on used options * * @param array $optionIds * @param Mage_Catalog_Model_Product $product diff --git a/app/code/core/Mage/Bundle/Model/Resource/Option/Collection.php b/app/code/core/Mage/Bundle/Model/Resource/Option/Collection.php index 9807abdabc5..502b736958b 100644 --- a/app/code/core/Mage/Bundle/Model/Resource/Option/Collection.php +++ b/app/code/core/Mage/Bundle/Model/Resource/Option/Collection.php @@ -194,7 +194,7 @@ public function resetAllIds() } /** - * Retrive all ids for collection + * Retrieve all ids for collection * * @return array */ diff --git a/app/code/core/Mage/Catalog/Block/Product/List/Toolbar.php b/app/code/core/Mage/Catalog/Block/Product/List/Toolbar.php index cbfc5b428ce..41e714783da 100644 --- a/app/code/core/Mage/Catalog/Block/Product/List/Toolbar.php +++ b/app/code/core/Mage/Catalog/Block/Product/List/Toolbar.php @@ -569,7 +569,7 @@ public function setModes($modes) } /** - * Retrive URL for view mode + * Retrieve URL for view mode * * @param string $mode * @return string diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Abstract.php b/app/code/core/Mage/Catalog/Block/Product/View/Abstract.php index 9016fb22823..4194ffa0932 100644 --- a/app/code/core/Mage/Catalog/Block/Product/View/Abstract.php +++ b/app/code/core/Mage/Catalog/Block/Product/View/Abstract.php @@ -34,7 +34,7 @@ abstract class Mage_Catalog_Block_Product_View_Abstract extends Mage_Catalog_Block_Product_Abstract { /** - * Retrive product + * Retrieve product * * @return Mage_Catalog_Model_Product */ diff --git a/app/code/core/Mage/Catalog/Helper/Product/Compare.php b/app/code/core/Mage/Catalog/Helper/Product/Compare.php index a88581f3c68..a32160cbdd0 100644 --- a/app/code/core/Mage/Catalog/Helper/Product/Compare.php +++ b/app/code/core/Mage/Catalog/Helper/Product/Compare.php @@ -165,7 +165,7 @@ public function getAddUrl($product) } /** - * Retrive add to wishlist url + * Retrieve add to wishlist url * * @param Mage_Catalog_Model_Product $product * @return string @@ -176,7 +176,7 @@ public function getAddToWishlistUrl($product) } /** - * Retrive add to cart url + * Retrieve add to cart url * * @param Mage_Catalog_Model_Product $product * @return string @@ -361,7 +361,7 @@ public function getAddUrlCustom($product, $addFormKey = true) } /** - * Retrive add to wishlist url with or without Form Key + * Retrieve add to wishlist url with or without Form Key * * @param Mage_Catalog_Model_Product $product * @param bool $addFormKey @@ -376,7 +376,7 @@ public function getAddToWishlistUrlCustom($product, $addFormKey = true) } /** - * Retrive add to cart url with or without Form Key + * Retrieve add to cart url with or without Form Key * * @param Mage_Catalog_Model_Product $product * @param bool $addFormKey diff --git a/app/code/core/Mage/Catalog/Model/Api/Resource.php b/app/code/core/Mage/Catalog/Model/Api/Resource.php index bce87a08706..39e94368163 100644 --- a/app/code/core/Mage/Catalog/Model/Api/Resource.php +++ b/app/code/core/Mage/Catalog/Model/Api/Resource.php @@ -86,7 +86,7 @@ protected function _isAllowedAttribute($attribute, $attributes = null) } /** - * Retrives store id from store code, if no store id specified, + * Retrieves store id from store code, if no store id specified, * it use seted session or admin store * * @param string|int $store diff --git a/app/code/core/Mage/Catalog/Model/Api2/Product/Rest.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Rest.php index 749b2ea6f5f..451996d27b0 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product/Rest.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Rest.php @@ -377,7 +377,7 @@ protected function _calculatePrice($price, $percent, $includeTax) } /** - * Retrive tier prices in special format + * Retrieve tier prices in special format * * @return array */ diff --git a/app/code/core/Mage/Catalog/Model/Product.php b/app/code/core/Mage/Catalog/Model/Product.php index 6ed5dfebf87..5dd0a324793 100644 --- a/app/code/core/Mage/Catalog/Model/Product.php +++ b/app/code/core/Mage/Catalog/Model/Product.php @@ -540,7 +540,7 @@ public function getLinkInstance() } /** - * Retrive product id by sku + * Retrieve product id by sku * * @param string $sku * @return integer @@ -1223,7 +1223,7 @@ public function getGroupedLinkCollection() ** Media API */ /** - * Retrive attributes for media gallery + * Retrieve attributes for media gallery * * @return Mage_Catalog_Model_Resource_Eav_Attribute[] */ @@ -1242,7 +1242,7 @@ public function getMediaAttributes() } /** - * Retrive media gallery images + * Retrieve media gallery images * * @return Varien_Data_Collection */ @@ -1288,7 +1288,7 @@ public function addImageToMediaGallery($file, $mediaAttribute = null, $move = fa } /** - * Retrive product media config + * Retrieve product media config * * @return Mage_Catalog_Model_Product_Media_Config */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Media.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Media.php index 550faa7351f..9ad01537b50 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Media.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Media.php @@ -474,7 +474,7 @@ public function removeImage(Mage_Catalog_Model_Product $product, $file) } /** - * Retrive image from gallery + * Retrieve image from gallery * * @param Mage_Catalog_Model_Product $product * @param string $file @@ -557,7 +557,7 @@ protected function _getResource() } /** - * Retrive media config + * Retrieve media config * * @return Mage_Catalog_Model_Product_Media_Config */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Abstract.php b/app/code/core/Mage/Catalog/Model/Product/Type/Abstract.php index e9d524aa202..6351912ef43 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Type/Abstract.php +++ b/app/code/core/Mage/Catalog/Model/Product/Type/Abstract.php @@ -828,7 +828,7 @@ public function hasRequiredOptions($product = null) } /** - * Retrive store filter for associated products + * Retrieve store filter for associated products * * @param null $product * @return int|Mage_Core_Model_Store diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Media.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Media.php index 5180a6b2992..6c220fc0bdb 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Media.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Media.php @@ -108,7 +108,7 @@ protected function _removeDuplicates(&$result) } /** - * Insert gallery value to db and retrive last id + * Insert gallery value to db and retrieve last id * * @param array $data * @return int diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Collection.php index f7bfaffb1be..fbe8d104dfc 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Collection.php @@ -966,7 +966,7 @@ protected function _buildClearSelect($select = null) } /** - * Retrive all ids for collection + * Retrieve all ids for collection * * @inheritDoc */ diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Type/Configurable/Attribute/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Type/Configurable/Attribute/Collection.php index da0e4dcf9c9..7474326c30d 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Type/Configurable/Attribute/Collection.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Type/Configurable/Attribute/Collection.php @@ -318,7 +318,7 @@ protected function _loadPrices() } /** - * Retrive product instance + * Retrieve product instance * * @return Mage_Catalog_Model_Product */ diff --git a/app/code/core/Mage/Checkout/Model/Cart/Shipping/Api.php b/app/code/core/Mage/Checkout/Model/Cart/Shipping/Api.php index 7e84c73ff0e..98884642909 100644 --- a/app/code/core/Mage/Checkout/Model/Cart/Shipping/Api.php +++ b/app/code/core/Mage/Checkout/Model/Cart/Shipping/Api.php @@ -106,7 +106,7 @@ public function getShippingMethodsList($quoteId, $store = null) } } } catch (Mage_Core_Exception $e) { - $this->_fault('shipping_methods_list_could_not_be_retrived', $e->getMessage()); + $this->_fault('shipping_methods_list_could_not_be_retrieved', $e->getMessage()); } return $ratesResult; diff --git a/app/code/core/Mage/Checkout/etc/api.xml b/app/code/core/Mage/Checkout/etc/api.xml index cda12908144..444061e0792 100644 --- a/app/code/core/Mage/Checkout/etc/api.xml +++ b/app/code/core/Mage/Checkout/etc/api.xml @@ -288,10 +288,10 @@ 1063 Can not set shipping method. - + 1064 Can not receive list of shipping methods. - + diff --git a/app/code/core/Mage/Core/Model/App.php b/app/code/core/Mage/Core/Model/App.php index 505e226d5e0..79560aeb7aa 100644 --- a/app/code/core/Mage/Core/Model/App.php +++ b/app/code/core/Mage/Core/Model/App.php @@ -1065,7 +1065,7 @@ public function getLocale() } /** - * Retrive layout object + * Retrieve layout object * * @return Mage_Core_Model_Layout */ diff --git a/app/code/core/Mage/Core/Model/Config.php b/app/code/core/Mage/Core/Model/Config.php index 435e1373158..c3667ef9526 100644 --- a/app/code/core/Mage/Core/Model/Config.php +++ b/app/code/core/Mage/Core/Model/Config.php @@ -720,7 +720,7 @@ public function setNode($path, $value, $overwrite = true) /** - * Retrive Declared Module file list + * Retrieve Declared Module file list * * @return array|false */ diff --git a/app/code/core/Mage/Core/Model/Email/Template.php b/app/code/core/Mage/Core/Model/Email/Template.php index 2a144fa4a55..0f258151f9f 100644 --- a/app/code/core/Mage/Core/Model/Email/Template.php +++ b/app/code/core/Mage/Core/Model/Email/Template.php @@ -210,7 +210,7 @@ public function loadDefault($templateId, $locale = null) } /** - * Retrive default templates from config + * Retrieve default templates from config * * @return array */ @@ -224,7 +224,7 @@ public static function getDefaultTemplates() } /** - * Retrive default templates as options array + * Retrieve default templates as options array * * @return array */ diff --git a/app/code/core/Mage/Core/Model/Translate.php b/app/code/core/Mage/Core/Model/Translate.php index d558e681cf9..3975f9cbd56 100644 --- a/app/code/core/Mage/Core/Model/Translate.php +++ b/app/code/core/Mage/Core/Model/Translate.php @@ -462,7 +462,7 @@ public function getTranslateInline() } /** - * Retrive translated template file + * Retrieve translated template file * * @param string $file * @param string $type diff --git a/app/code/core/Mage/Customer/Block/Address/Renderer/Default.php b/app/code/core/Mage/Customer/Block/Address/Renderer/Default.php index 1a2de3a2c71..cbae2e51ded 100644 --- a/app/code/core/Mage/Customer/Block/Address/Renderer/Default.php +++ b/app/code/core/Mage/Customer/Block/Address/Renderer/Default.php @@ -42,7 +42,7 @@ class Mage_Customer_Block_Address_Renderer_Default extends Mage_Core_Block_Abstr protected $_type; /** - * Retrive format type object + * Retrieve format type object * * @return Varien_Object */ @@ -52,7 +52,7 @@ public function getType() } /** - * Retrive format type object + * Retrieve format type object * * @param Varien_Object $type * @return $this diff --git a/app/code/core/Mage/Customer/Block/Address/Renderer/Interface.php b/app/code/core/Mage/Customer/Block/Address/Renderer/Interface.php index abb4568e40d..b15a3206e17 100644 --- a/app/code/core/Mage/Customer/Block/Address/Renderer/Interface.php +++ b/app/code/core/Mage/Customer/Block/Address/Renderer/Interface.php @@ -42,7 +42,7 @@ interface Mage_Customer_Block_Address_Renderer_Interface public function setType(Varien_Object $type); /** - * Retrive format type object + * Retrieve format type object * * @return Varien_Object */ diff --git a/app/code/core/Mage/Customer/Model/Address/Abstract.php b/app/code/core/Mage/Customer/Model/Address/Abstract.php index 6790cfc2272..0e636efeba4 100644 --- a/app/code/core/Mage/Customer/Model/Address/Abstract.php +++ b/app/code/core/Mage/Customer/Model/Address/Abstract.php @@ -338,7 +338,7 @@ public function getCountry() } /** - * Retrive country model + * Retrieve country model * * @return Mage_Directory_Model_Country */ @@ -353,7 +353,7 @@ public function getCountryModel() } /** - * Retrive country model + * Retrieve country model * * @param int|null $region * @return Mage_Directory_Model_Country @@ -405,7 +405,7 @@ public function format($type) } /** - * Retrive address config object + * Retrieve address config object * * @return Mage_Customer_Model_Address_Config */ diff --git a/app/code/core/Mage/Customer/Model/Address/Api.php b/app/code/core/Mage/Customer/Model/Address/Api.php index 0e90c096802..0d19107ccbb 100644 --- a/app/code/core/Mage/Customer/Model/Address/Api.php +++ b/app/code/core/Mage/Customer/Model/Address/Api.php @@ -43,7 +43,7 @@ public function __construct() } /** - * Retrive customer addresses list + * Retrieve customer addresses list * * @param int $customerId * @return array diff --git a/app/code/core/Mage/Customer/Model/Customer.php b/app/code/core/Mage/Customer/Model/Customer.php index bc66d80929d..f025929bb03 100644 --- a/app/code/core/Mage/Customer/Model/Customer.php +++ b/app/code/core/Mage/Customer/Model/Customer.php @@ -939,7 +939,7 @@ public function getSharedStoreIds() } /** - * Retrive shared website ids + * Retrieve shared website ids * * @return array */ diff --git a/app/code/core/Mage/Directory/Model/Country.php b/app/code/core/Mage/Directory/Model/Country.php index ac1ae3f12e1..32d7f938e33 100644 --- a/app/code/core/Mage/Directory/Model/Country.php +++ b/app/code/core/Mage/Directory/Model/Country.php @@ -131,7 +131,7 @@ public function formatAddress(Varien_Object $address, $html = false) } /** - * Retrive formats for + * Retrieve formats for * * @return Mage_Directory_Model_Resource_Country_Format_Collection */ @@ -152,7 +152,7 @@ public function getFormats() } /** - * Retrive format + * Retrieve format * * @param string $type * @return Mage_Directory_Model_Country_Format diff --git a/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php b/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php index f5c89801963..921a8363809 100644 --- a/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php +++ b/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php @@ -275,7 +275,7 @@ public function getUploadButtonHtml() } /** - * Retrive config json + * Retrieve config json * * @param string $type * @return string diff --git a/app/code/core/Mage/Eav/Model/Entity/Collection/Abstract.php b/app/code/core/Mage/Eav/Model/Entity/Collection/Abstract.php index 691e4616793..4ae853605a6 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Collection/Abstract.php +++ b/app/code/core/Mage/Eav/Model/Entity/Collection/Abstract.php @@ -923,7 +923,7 @@ protected function _getAllIdsSelect($limit = null, $offset = null) } /** - * Retrive all ids for collection + * Retrieve all ids for collection * * @param int $limit * @param int $offset @@ -935,7 +935,7 @@ public function getAllIds($limit = null, $offset = null) } /** - * Retrive all ids sql + * Retrieve all ids sql * * @deprecated * @return Varien_Db_Select diff --git a/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/View/Items.php b/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/View/Items.php index 94635357caa..713d3dba4e2 100644 --- a/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/View/Items.php +++ b/app/code/core/Mage/GiftMessage/Block/Adminhtml/Sales/Order/View/Items.php @@ -51,7 +51,7 @@ public function getItem() } /** - * Retrive default value for giftmessage sender + * Retrieve default value for giftmessage sender * * @return string */ @@ -69,7 +69,7 @@ public function getDefaultSender() } /** - * Retrive default value for giftmessage recipient + * Retrieve default value for giftmessage recipient * * @return string */ @@ -97,7 +97,7 @@ public function getDefaultRecipient() } /** - * Retrive real name for field + * Retrieve real name for field * * @param string $name * @return string @@ -108,7 +108,7 @@ public function getFieldName($name) } /** - * Retrive real html id for field + * Retrieve real html id for field * * @param string $id * @return string @@ -119,7 +119,7 @@ public function getFieldId($id) } /** - * Retrive field html id prefix + * Retrieve field html id prefix * * @return string */ @@ -150,7 +150,7 @@ protected function _initMessage() } /** - * Retrive gift message for entity + * Retrieve gift message for entity * * @return Mage_GiftMessage_Model_Message */ @@ -178,7 +178,7 @@ public function getSaveUrl() } /** - * Retrive block html id + * Retrieve block html id * * @return string */ diff --git a/app/code/core/Mage/GiftMessage/Helper/Message.php b/app/code/core/Mage/GiftMessage/Helper/Message.php index 4c15f337e4d..88dbafe4446 100644 --- a/app/code/core/Mage/GiftMessage/Helper/Message.php +++ b/app/code/core/Mage/GiftMessage/Helper/Message.php @@ -55,7 +55,7 @@ class Mage_GiftMessage_Helper_Message extends Mage_Core_Helper_Data protected $_innerCache = array(); /** - * Retrive old stule edit button html for editing of giftmessage in popup + * Retrieve old stule edit button html for editing of giftmessage in popup * * @param string $type * @param Varien_Object $entity @@ -75,7 +75,7 @@ public function getButton($type, Varien_Object $entity) } /** - * Retrive inline giftmessage edit form for specified entity + * Retrieve inline giftmessage edit form for specified entity * * @param string $type * @param Varien_Object $entity @@ -190,7 +190,7 @@ public function getIsMessagesAvailable($type, Varien_Object $entity, $store = nu } /** - * Retrive escaped and preformated gift message text for specified entity + * Retrieve escaped and preformated gift message text for specified entity * * @param Varien_Object $entity * @return string|null @@ -205,7 +205,7 @@ public function getEscapedGiftMessage(Varien_Object $entity) } /** - * Retrive gift message for entity. If message not exists return null + * Retrieve gift message for entity. If message not exists return null * * @param Varien_Object $entity * @return Mage_GiftMessage_Model_Message @@ -220,7 +220,7 @@ public function getGiftMessageForEntity(Varien_Object $entity) } /** - * Retrive internal cached data with specified key. + * Retrieve internal cached data with specified key. * * If cached data not found return null. * @@ -296,7 +296,7 @@ public function getAvailableForAddressItems($items, $store = null) } /** - * Retrive gift message with specified id + * Retrieve gift message with specified id * * @param integer $messageId * @return Mage_GiftMessage_Model_Message diff --git a/app/code/core/Mage/GiftMessage/Helper/Url.php b/app/code/core/Mage/GiftMessage/Helper/Url.php index 81c594ba60d..718ab23aa68 100644 --- a/app/code/core/Mage/GiftMessage/Helper/Url.php +++ b/app/code/core/Mage/GiftMessage/Helper/Url.php @@ -34,7 +34,7 @@ class Mage_GiftMessage_Helper_Url extends Mage_Core_Helper_Url { /** - * Retrive gift message save url + * Retrieve gift message save url * * @param Varien_Object $item * @param string $type @@ -53,7 +53,7 @@ public function getEditUrl(Varien_Object $item, $type, $params = array()) } /** - * Retrive gift message button block url + * Retrieve gift message button block url * * @param integer $itemId * @param string $type @@ -67,7 +67,7 @@ public function getButtonUrl($itemId, $type, $params = array()) } /** - * Retrive gift message remove url + * Retrieve gift message remove url * * @param integer $itemId * @param string $type @@ -81,7 +81,7 @@ public function getRemoveUrl($itemId, $type, $params = array()) } /** - * Retrive gift message save url + * Retrieve gift message save url * * @param integer $itemId * @param string $type diff --git a/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Grouped.php b/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Grouped.php index 0411d70951d..44eea4011bb 100644 --- a/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Grouped.php +++ b/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Grouped.php @@ -50,7 +50,7 @@ class Mage_ImportExport_Model_Import_Entity_Product_Type_Grouped extends Mage_Im protected $_behavior; /** - * Retrive model behavior + * Retrieve model behavior * * @return string */ diff --git a/app/code/core/Mage/Media/Model/File/Image.php b/app/code/core/Mage/Media/Model/File/Image.php index da004d27e2c..5307ae5b52c 100644 --- a/app/code/core/Mage/Media/Model/File/Image.php +++ b/app/code/core/Mage/Media/Model/File/Image.php @@ -207,7 +207,7 @@ public function saveAs(Mage_Media_Model_Image $object, $extension = null) } /** - * Retrive image dimensions + * Retrieve image dimensions * * @param Mage_Media_Model_Image $object * @return Varien_Object diff --git a/app/code/core/Mage/Media/Model/Image.php b/app/code/core/Mage/Media/Model/Image.php index 8f6e1ee89cb..128edb0f0f4 100644 --- a/app/code/core/Mage/Media/Model/Image.php +++ b/app/code/core/Mage/Media/Model/Image.php @@ -83,7 +83,7 @@ public function setConfig(Mage_Media_Model_Image_Config_Interface $config) } /** - * Retrive media image config instance + * Retrieve media image config instance * * @return Mage_Media_Model_Image_Config_Interface */ @@ -117,7 +117,7 @@ public function getTmpImage() } /** - * Retrive source dimensions object + * Retrieve source dimensions object * * @return Varien_Object */ @@ -130,7 +130,7 @@ public function getDimensions() } /** - * Retrive destanation dimensions object + * Retrieve destanation dimensions object * * @return Varien_Object */ diff --git a/app/code/core/Mage/Media/Model/Image/Config/Interface.php b/app/code/core/Mage/Media/Model/Image/Config/Interface.php index b6b6270b4a7..e9bb9f7ff80 100644 --- a/app/code/core/Mage/Media/Model/Image/Config/Interface.php +++ b/app/code/core/Mage/Media/Model/Image/Config/Interface.php @@ -36,21 +36,21 @@ interface Mage_Media_Model_Image_Config_Interface { /** - * Retrive base url for media files + * Retrieve base url for media files * * @return string */ public function getBaseMediaUrl(); /** - * Retrive base path for media files + * Retrieve base path for media files * * @return string */ public function getBaseMediaPath(); /** - * Retrive url for media file + * Retrieve url for media file * * @param string $file * @return string @@ -58,7 +58,7 @@ public function getBaseMediaPath(); public function getMediaUrl($file); /** - * Retrive file system path for media file + * Retrieve file system path for media file * * @param string $file * @return string diff --git a/app/code/core/Mage/Payment/Block/Form/Cc.php b/app/code/core/Mage/Payment/Block/Form/Cc.php index e4a9d4f20d9..2f173d366b5 100644 --- a/app/code/core/Mage/Payment/Block/Form/Cc.php +++ b/app/code/core/Mage/Payment/Block/Form/Cc.php @@ -98,7 +98,7 @@ public function getCcYears() } /** - * Retrive has verification configuration + * Retrieve has verification configuration * * @return boolean */ diff --git a/app/code/core/Mage/ProductAlert/Block/Email/Price.php b/app/code/core/Mage/ProductAlert/Block/Email/Price.php index 3fed30ae695..e6d9a557b3b 100644 --- a/app/code/core/Mage/ProductAlert/Block/Email/Price.php +++ b/app/code/core/Mage/ProductAlert/Block/Email/Price.php @@ -45,7 +45,7 @@ public function __construct() } /** - * Retrive unsubscribe url for product + * Retrieve unsubscribe url for product * * @param int $productId * @return string diff --git a/app/code/core/Mage/ProductAlert/Block/Email/Stock.php b/app/code/core/Mage/ProductAlert/Block/Email/Stock.php index 2929a696cc1..d8f9aacb439 100644 --- a/app/code/core/Mage/ProductAlert/Block/Email/Stock.php +++ b/app/code/core/Mage/ProductAlert/Block/Email/Stock.php @@ -45,7 +45,7 @@ public function __construct() } /** - * Retrive unsubscribe url for product + * Retrieve unsubscribe url for product * * @param int $productId * @return string diff --git a/app/code/core/Mage/Reports/Model/Resource/Report/Abstract.php b/app/code/core/Mage/Reports/Model/Resource/Report/Abstract.php index 219c0a00d7d..024f577bccb 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Report/Abstract.php +++ b/app/code/core/Mage/Reports/Model/Resource/Report/Abstract.php @@ -42,7 +42,7 @@ abstract class Mage_Reports_Model_Resource_Report_Abstract extends Mage_Core_Mod protected $_flag = null; /** - * Retrive flag object + * Retrieve flag object * * @return Mage_Reports_Model_Flag */ diff --git a/app/code/core/Mage/Review/Model/Resource/Review/Product/Collection.php b/app/code/core/Mage/Review/Model/Resource/Review/Product/Collection.php index 3fcdac0510f..40d5b2c121d 100644 --- a/app/code/core/Mage/Review/Model/Resource/Review/Product/Collection.php +++ b/app/code/core/Mage/Review/Model/Resource/Review/Product/Collection.php @@ -301,7 +301,7 @@ protected function _joinFields() } /** - * Retrive all ids for collection + * Retrieve all ids for collection * * @inheritDoc */ diff --git a/app/code/core/Mage/Sales/Model/Order/Invoice/Api.php b/app/code/core/Mage/Sales/Model/Order/Invoice/Api.php index 44234591e4a..21d25b27e0f 100644 --- a/app/code/core/Mage/Sales/Model/Order/Invoice/Api.php +++ b/app/code/core/Mage/Sales/Model/Order/Invoice/Api.php @@ -45,7 +45,7 @@ public function __construct() } /** - * Retrive invoices list. Filtration could be applied + * Retrieve invoices list. Filtration could be applied * * @param null|object|array $filters * @return array diff --git a/app/code/core/Mage/Sales/Model/Resource/Collection/Abstract.php b/app/code/core/Mage/Sales/Model/Resource/Collection/Abstract.php index 6cadf387b62..1d212fc393a 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Collection/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Resource/Collection/Abstract.php @@ -131,7 +131,7 @@ protected function _getAllIdsSelect($limit = null, $offset = null) } /** - * Retrive all ids for collection + * Retrieve all ids for collection * Backward compatibility with EAV collection * * @param int $limit diff --git a/js/lib/flex.js b/js/lib/flex.js index a7916c5db3a..07d604bc3e6 100644 --- a/js/lib/flex.js +++ b/js/lib/flex.js @@ -224,7 +224,7 @@ Flex.Object = Class.create({ } }, /** - * Retrive object attribute value used for generation in html tags + * Retrieve object attribute value used for generation in html tags * * @param Sting name * @return Object diff --git a/js/tiny_mce/classes/Editor.js b/js/tiny_mce/classes/Editor.js index 5a72ccf8073..d1e3765cf76 100644 --- a/js/tiny_mce/classes/Editor.js +++ b/js/tiny_mce/classes/Editor.js @@ -1004,7 +1004,7 @@ * * @method getLang * @param {String} n Name/key to get from the language pack. - * @param {String} dv Optional default value to retrive. + * @param {String} dv Optional default value to retrieve. */ getLang : function(n, dv) { return tinymce.i18n[(this.settings.language || 'en') + '.' + n] || (is(dv) ? dv : '{#' + n + '}'); @@ -1014,7 +1014,7 @@ * Returns a configuration parameter by name. * * @method getParam - * @param {String} n Configruation parameter to retrive. + * @param {String} n Configruation parameter to retrieve. * @param {String} dv Optional default value to return. * @param {String} ty Optional type parameter. * @return {String} Configuration parameter value or default value. diff --git a/js/tiny_mce/classes/Formatter.js b/js/tiny_mce/classes/Formatter.js index 7fc8203b3bc..2272e7dacbc 100644 --- a/js/tiny_mce/classes/Formatter.js +++ b/js/tiny_mce/classes/Formatter.js @@ -169,7 +169,7 @@ * Returns the format by name or all formats if no name is specified. * * @method get - * @param {String} name Optional name to retrive by. + * @param {String} name Optional name to retrieve by. * @return {Array/Object} Array/Object with all registred formats or a specific format. */ function get(name) { diff --git a/js/tiny_mce/classes/Popup.js b/js/tiny_mce/classes/Popup.js index ab6be1e5cea..2174d43ab40 100644 --- a/js/tiny_mce/classes/Popup.js +++ b/js/tiny_mce/classes/Popup.js @@ -87,7 +87,7 @@ tinyMCEPopup = { * Returns a window argument/parameter by name. * * @method getWindowArg - * @param {String} n Name of the window argument to retrive. + * @param {String} n Name of the window argument to retrieve. * @param {String} dv Optional default value to return. * @return {String} Argument value or default value if it wasn't found. */ @@ -101,7 +101,7 @@ tinyMCEPopup = { * Returns a editor parameter/config option value. * * @method getParam - * @param {String} n Name of the editor config option to retrive. + * @param {String} n Name of the editor config option to retrieve. * @param {String} dv Optional default value to return. * @return {String} Parameter value or default value if it wasn't found. */ diff --git a/js/tiny_mce/classes/WindowManager.js b/js/tiny_mce/classes/WindowManager.js index 4336ac22e00..d70226126c6 100644 --- a/js/tiny_mce/classes/WindowManager.js +++ b/js/tiny_mce/classes/WindowManager.js @@ -71,7 +71,7 @@ * @option {Boolean} translate_i18n Specifies whether translation should occur or not of i18 key strings. Default is true. * @option {String/bool} close_previous Specifies whether a previously opened popup window is to be closed or not (like when calling the file browser window over the advlink popup). * @option {String/bool} scrollbars Specifies whether the popup window can have scrollbars if required (i.e. content larger than the popup size specified). - * @param {Object} p Optional parameters/arguments collection can be used by the dialogs to retrive custom parameters. + * @param {Object} p Optional parameters/arguments collection can be used by the dialogs to retrieve custom parameters. * @option {String} plugin_url url to plugin if opening plugin window that calls tinyMCEPopup.requireLangPack() and needs access to the plugin language js files */ open : function(s, p) { diff --git a/js/tiny_mce/classes/adapter/jquery/adapter.js b/js/tiny_mce/classes/adapter/jquery/adapter.js index 5c462c4f3bf..55018f5dde7 100644 --- a/js/tiny_mce/classes/adapter/jquery/adapter.js +++ b/js/tiny_mce/classes/adapter/jquery/adapter.js @@ -42,7 +42,7 @@ function attr(name, value) { var self = this; - // Update/retrive data-mce- attribute variants + // Update/retrieve data-mce- attribute variants if (attrRegExp.test(name)) { if (value !== undef) { // Use TinyMCE behavior when setting the specifc attributes diff --git a/js/tiny_mce/classes/ui/Container.js b/js/tiny_mce/classes/ui/Container.js index 06914f00f11..e304757452e 100644 --- a/js/tiny_mce/classes/ui/Container.js +++ b/js/tiny_mce/classes/ui/Container.js @@ -56,7 +56,7 @@ tinymce.create('tinymce.ui.Container:tinymce.ui.Control', { * Returns a control by id from the containers collection. * * @method get - * @param {String} n Id for the control to retrive. + * @param {String} n Id for the control to retrieve. * @return {tinymce.ui.Control} Control instance by the specified name or undefined if it wasn't found. */ get : function(n) { diff --git a/js/tiny_mce/classes/util/Cookie.js b/js/tiny_mce/classes/util/Cookie.js index 2c678b323c7..b30ca484e1f 100644 --- a/js/tiny_mce/classes/util/Cookie.js +++ b/js/tiny_mce/classes/util/Cookie.js @@ -73,7 +73,7 @@ * Gets the raw data of a cookie by name. * * @method get - * @param {String} n Name of cookie to retrive. + * @param {String} n Name of cookie to retrieve. * @return {String} Cookie data string. */ get : function(n) { diff --git a/js/tiny_mce/classes/xml/Parser.js b/js/tiny_mce/classes/xml/Parser.js index 76cd8add59e..6d21b996ae5 100644 --- a/js/tiny_mce/classes/xml/Parser.js +++ b/js/tiny_mce/classes/xml/Parser.js @@ -105,7 +105,7 @@ /** * Returns all string contents of a element concated together. * - * @param {XMLNode} el XML element to retrive text from. + * @param {XMLNode} el XML element to retrieve text from. * @return {string} XML element text contents. */ getText : function(el) { diff --git a/js/tiny_mce/tiny_mce_jquery_src.js b/js/tiny_mce/tiny_mce_jquery_src.js index 70ec2b7db71..bf7eed09f70 100644 --- a/js/tiny_mce/tiny_mce_jquery_src.js +++ b/js/tiny_mce/tiny_mce_jquery_src.js @@ -486,7 +486,7 @@ function attr(name, value) { var self = this; - // Update/retrive data-mce- attribute variants + // Update/retrieve data-mce- attribute variants if (attrRegExp.test(name)) { if (value !== undef) { // Use TinyMCE behavior when setting the specifc attributes diff --git a/lib/Zend/OpenId/Consumer.php b/lib/Zend/OpenId/Consumer.php index 128bf34fdab..d2e56d6034c 100644 --- a/lib/Zend/OpenId/Consumer.php +++ b/lib/Zend/OpenId/Consumer.php @@ -454,7 +454,7 @@ protected function _addAssociation($url, $handle, $macFunc, $secret, $expires) } /** - * Retrive assiciation information for given $url from internal cahce or + * Retrieve assiciation information for given $url from internal cahce or * external storage * * @param string $url OpenID server url diff --git a/lib/Zend/Pdf.php b/lib/Zend/Pdf.php index d4a262c7a4f..4a755981edb 100644 --- a/lib/Zend/Pdf.php +++ b/lib/Zend/Pdf.php @@ -413,7 +413,7 @@ public function __construct($source = null, $revision = null, $load = false) } /** - * Retrive number of revisions. + * Retrieve number of revisions. * * @return integer */ diff --git a/lib/Zend/Pdf/ElementFactory.php b/lib/Zend/Pdf/ElementFactory.php index c61fcfc8a87..6f1f143550b 100644 --- a/lib/Zend/Pdf/ElementFactory.php +++ b/lib/Zend/Pdf/ElementFactory.php @@ -271,7 +271,7 @@ public function cleanEnumerationShiftCache() } /** - * Retrive object enumeration shift. + * Retrieve object enumeration shift. * * @param Zend_Pdf_ElementFactory_Interface $factory * @return integer diff --git a/lib/Zend/Pdf/ElementFactory/Interface.php b/lib/Zend/Pdf/ElementFactory/Interface.php index 2cd51a05814..4122ffcdb27 100644 --- a/lib/Zend/Pdf/ElementFactory/Interface.php +++ b/lib/Zend/Pdf/ElementFactory/Interface.php @@ -96,7 +96,7 @@ public function calculateShift(Zend_Pdf_ElementFactory_Interface $factory); public function cleanEnumerationShiftCache(); /** - * Retrive object enumeration shift. + * Retrieve object enumeration shift. * * @param Zend_Pdf_ElementFactory_Interface $factory * @return integer diff --git a/lib/Zend/Pdf/ElementFactory/Proxy.php b/lib/Zend/Pdf/ElementFactory/Proxy.php index bb82726f532..f653fd780db 100644 --- a/lib/Zend/Pdf/ElementFactory/Proxy.php +++ b/lib/Zend/Pdf/ElementFactory/Proxy.php @@ -151,7 +151,7 @@ public function cleanEnumerationShiftCache() } /** - * Retrive object enumeration shift. + * Retrieve object enumeration shift. * * @param Zend_Pdf_ElementFactory_Interface $factory * @return integer diff --git a/lib/Zend/Pdf/Page.php b/lib/Zend/Pdf/Page.php index 1f8d49a8eae..6c116d34677 100644 --- a/lib/Zend/Pdf/Page.php +++ b/lib/Zend/Pdf/Page.php @@ -526,7 +526,7 @@ public function clonePage($factory, &$processed) } /** - * Retrive PDF file reference to the page + * Retrieve PDF file reference to the page * * @internal * @return Zend_Pdf_Element_Dictionary diff --git a/lib/Zend/Search/Lucene.php b/lib/Zend/Search/Lucene.php index 2b0bbd47110..5f139bca206 100644 --- a/lib/Zend/Search/Lucene.php +++ b/lib/Zend/Search/Lucene.php @@ -1307,7 +1307,7 @@ public function docFreq(Zend_Search_Lucene_Index_Term $term) /** - * Retrive similarity used by index reader + * Retrieve similarity used by index reader * * @return Zend_Search_Lucene_Search_Similarity */ diff --git a/lib/Zend/Search/Lucene/Interface.php b/lib/Zend/Search/Lucene/Interface.php index f5e423fa39d..496451468d2 100644 --- a/lib/Zend/Search/Lucene/Interface.php +++ b/lib/Zend/Search/Lucene/Interface.php @@ -336,7 +336,7 @@ public function termPositions(Zend_Search_Lucene_Index_Term $term, $docsFilter = public function docFreq(Zend_Search_Lucene_Index_Term $term); /** - * Retrive similarity used by index reader + * Retrieve similarity used by index reader * * @return Zend_Search_Lucene_Search_Similarity */ diff --git a/lib/Zend/Search/Lucene/MultiSearcher.php b/lib/Zend/Search/Lucene/MultiSearcher.php index b91dc66a5cc..ce205b31edc 100644 --- a/lib/Zend/Search/Lucene/MultiSearcher.php +++ b/lib/Zend/Search/Lucene/MultiSearcher.php @@ -697,7 +697,7 @@ public function docFreq(Zend_Search_Lucene_Index_Term $term) } /** - * Retrive similarity used by index reader + * Retrieve similarity used by index reader * * @return Zend_Search_Lucene_Search_Similarity * @throws Zend_Search_Lucene_Exception diff --git a/lib/Zend/Search/Lucene/Proxy.php b/lib/Zend/Search/Lucene/Proxy.php index 7aff117b1a1..bba2efafd7e 100644 --- a/lib/Zend/Search/Lucene/Proxy.php +++ b/lib/Zend/Search/Lucene/Proxy.php @@ -447,7 +447,7 @@ public function docFreq(Zend_Search_Lucene_Index_Term $term) } /** - * Retrive similarity used by index reader + * Retrieve similarity used by index reader * * @return Zend_Search_Lucene_Search_Similarity */ diff --git a/lib/Zend/Service/Delicious/PostList.php b/lib/Zend/Service/Delicious/PostList.php index 23906fad437..0e5ebd4e769 100644 --- a/lib/Zend/Service/Delicious/PostList.php +++ b/lib/Zend/Service/Delicious/PostList.php @@ -23,7 +23,7 @@ /** - * List of posts retrived from the del.icio.us web service + * List of posts retrieved from the del.icio.us web service * * @category Zend * @package Zend_Service diff --git a/lib/Zend/Service/Rackspace/Files/ContainerList.php b/lib/Zend/Service/Rackspace/Files/ContainerList.php index ca605e42698..37ed51280b0 100644 --- a/lib/Zend/Service/Rackspace/Files/ContainerList.php +++ b/lib/Zend/Service/Rackspace/Files/ContainerList.php @@ -23,7 +23,7 @@ #require_once 'Zend/Service/Rackspace/Files.php'; /** - * List of servers retrived from the Rackspace web service + * List of servers retrieved from the Rackspace web service * * @uses ArrayAccess * @uses Countable diff --git a/lib/Zend/Service/Rackspace/Files/ObjectList.php b/lib/Zend/Service/Rackspace/Files/ObjectList.php index 0b86b4bcc11..96594f15cf2 100644 --- a/lib/Zend/Service/Rackspace/Files/ObjectList.php +++ b/lib/Zend/Service/Rackspace/Files/ObjectList.php @@ -23,7 +23,7 @@ #require_once 'Zend/Service/Rackspace/Files.php'; /** - * List of servers retrived from the GoGrid web service + * List of servers retrieved from the GoGrid web service * * @uses ArrayAccess * @uses Countable diff --git a/lib/flex/varien/varien/upload/Uploader.as b/lib/flex/varien/varien/upload/Uploader.as index b03d16c10d3..c5c6ebfb801 100644 --- a/lib/flex/varien/varien/upload/Uploader.as +++ b/lib/flex/varien/varien/upload/Uploader.as @@ -160,7 +160,7 @@ package varien.upload } /** - * Retrive file filters as array + * Retrieve file filters as array */ public function getTypeFiltersArray():Array { @@ -172,7 +172,7 @@ package varien.upload } /** - * Retrive file filters as object + * Retrieve file filters as object */ public function getTypeFilters():Object { @@ -180,7 +180,7 @@ package varien.upload } /** - * Retrive file filter with specified id + * Retrieve file filter with specified id * * @param filterId filter unique id */ @@ -235,7 +235,7 @@ package varien.upload } /** - * Retrive file info with specified id + * Retrieve file info with specified id * * @param id file id */ @@ -249,7 +249,7 @@ package varien.upload } /** - * Retrive file info for all files as array + * Retrieve file info for all files as array */ public function get filesInfo():Array { @@ -384,7 +384,7 @@ package varien.upload } /** - * Retrive file reference by id + * Retrieve file reference by id * * @param id file id */ @@ -397,7 +397,7 @@ package varien.upload } /** - * Retrive file id by reference + * Retrieve file id by reference * * @param file FileReference */