Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/code/core/Mage/Catalog/Block/Product/List/Toolbar.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class Mage_Catalog_Block_Product_List_Toolbar extends Mage_Core_Block_Template
/**
* Products collection
*
* @var Mage_Core_Model_Mysql4_Collection_Abstract
* @var Mage_Core_Model_Resource_Db_Collection_Abstract
*/
protected $_collection = null;

Expand Down Expand Up @@ -234,7 +234,7 @@ public function setCollection($collection)
/**
* Return products collection instance
*
* @return Mage_Core_Model_Mysql4_Collection_Abstract
* @return Mage_Core_Model_Resource_Db_Collection_Abstract
*/
public function getCollection()
{
Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Core/Model/Config.php
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ class Mage_Core_Model_Config extends Mage_Core_Model_Config_Base
* Resource model
* Used for operations with DB
*
* @var Mage_Core_Model_Mysql4_Config
* @var Mage_Core_Model_Resource_Config
*/
protected $_resourceModel;

Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Reports/Block/Product/Abstract.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ abstract class Mage_Reports_Block_Product_Abstract extends Mage_Catalog_Block_Pr
/**
* Product Index Collection
*
* @var Mage_Reports_Model_Mysql4_Product_Index_Collection_Abstract
* @var Mage_Reports_Model_Resource_Product_Index_Collection_Abstract
*/
protected $_collection;

Expand Down
4 changes: 2 additions & 2 deletions app/code/core/Mage/Sales/Block/Billing/Agreement/View.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,14 @@ class Mage_Sales_Block_Billing_Agreement_View extends Mage_Core_Block_Template
/**
* Related orders collection
*
* @var Mage_Sales_Model_Mysql4_Order_Collection
* @var Mage_Sales_Model_Resource_Order_Collection
*/
protected $_relatedOrders = null;

/**
* Retrieve related orders collection
*
* @return Mage_Sales_Model_Mysql4_Order_Collection
* @return Mage_Sales_Model_Resource_Order_Collection
*/
public function getRelatedOrders()
{
Expand Down
4 changes: 2 additions & 2 deletions app/code/core/Mage/Sales/Block/Billing/Agreements.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class Mage_Sales_Block_Billing_Agreements extends Mage_Core_Block_Template
/**
* Billing agreements collection
*
* @var Mage_Sales_Model_Mysql4_Billing_Agreement_Collection
* @var Mage_Sales_Model_Resource_Billing_Agreement_Collection
*/
protected $_billingAgreements = null;

Expand All @@ -61,7 +61,7 @@ protected function _prepareLayout()
/**
* Retrieve billing agreements collection
*
* @return Mage_Sales_Model_Mysql4_Billing_Agreement_Collection
* @return Mage_Sales_Model_Resource_Billing_Agreement_Collection
*/
public function getBillingAgreements()
{
Expand Down
4 changes: 2 additions & 2 deletions app/code/core/Mage/Sales/Block/Order/Comments.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class Mage_Sales_Block_Order_Comments extends Mage_Core_Block_Template
/**
* Currect comments collection
*
* @var Mage_Sales_Model_Mysql4_Order_Comment_Collection_Abstract
* @var Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract
*/
protected $_commentCollection;

Expand Down Expand Up @@ -59,7 +59,7 @@ public function getEntity()
/**
* Initialize model comments and return comment collection
*
* @return Mage_Sales_Model_Mysql4_Order_Comment_Collection_Abstract
* @return Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract
*/
public function getComments()
{
Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Sales/Block/Order/Print/Shipment.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class Mage_Sales_Block_Order_Print_Shipment extends Mage_Sales_Block_Items_Abstr
/**
* Order shipments collection
*
* @var array|Mage_Sales_Model_Mysql4_Order_Shipment_Collection
* @var array|Mage_Sales_Model_Resource_Order_Shipment_Collection
*/
protected $_shipmentsCollection;

Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Sales/Block/Recurring/Profile/View.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class Mage_Sales_Block_Recurring_Profile_View extends Mage_Core_Block_Template
/**
* Related orders collection
*
* @var Mage_Sales_Model_Mysql4_Order_Collection
* @var Mage_Sales_Model_Resource_Order_Collection
*/
protected $_relatedOrders = null;

Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Sales/Block/Recurring/Profiles.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class Mage_Sales_Block_Recurring_Profiles extends Mage_Core_Block_Template
/**
* Profiles collection
*
* @var Mage_Sales_Model_Mysql4_Recurring_Profile_Collection
* @var Mage_Sales_Model_Resource_Recurring_Profile_Collection
*/
protected $_profiles = null;

Expand Down
4 changes: 2 additions & 2 deletions app/code/core/Mage/Tag/Block/Customer/View.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class Mage_Tag_Block_Customer_View extends Mage_Catalog_Block_Product_Abstract
/**
* Tagged Product Collection
*
* @var Mage_Tag_Model_Mysql4_Product_Collection
* @var Mage_Tag_Model_Resource_Product_Collection
*/
protected $_collection;

Expand Down Expand Up @@ -137,7 +137,7 @@ public function getMode()
/**
* Retrieve Tagged product(s) collection
*
* @return Mage_Tag_Model_Mysql4_Product_Collection
* @return Mage_Tag_Model_Resource_Product_Collection
*/
protected function _getCollection()
{
Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Wishlist/Model/Wishlist.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class Mage_Wishlist_Model_Wishlist extends Mage_Core_Model_Abstract
/**
* Wishlist item collection
*
* @var Mage_Wishlist_Model_Mysql4_Item_Collection
* @var Mage_Wishlist_Model_Resource_Item_Collection
*/
protected $_itemCollection = null;

Expand Down