Permalink
Browse files

Merged revisions 31108-31133 via svnmerge from 1.2-trunk

      Updated downloader version to 1.2.0
      Fixed checking order status for downloadable products to become available
      Fixed #9757: Paypal Payment Pro Direct not visible
      Changed app/etc/local.xml* license to AFL
      Fixed cross sells issues on frontend
      Fixed serialized data checking when reading FPT data from order item
      Added autoguessing mime type of a file if mimemagic extension is not installed
  • Loading branch information...
1 parent d64a68d commit 5e6c3b792f4dbb76963b6fb6d4d14450d71c2e13 Magento Core Team committed Dec 30, 2008
View
@@ -178,6 +178,10 @@ FIXED BUGS:
Fixed grid to select products SKU in price rules in IE6/7
Fixed duplicate diplaying prices in bundle product price ranges
Fixed displaying category image in blank theme
+ Fixed cross sells issues on frontend
+ Fixed serialized data checking when reading FPT data from order item
+ Fixed checking order status for downloadable products to become available
+ Fixed #9757: Paypal Payment Pro Direct not visible
CHANGES:
@@ -221,6 +225,9 @@ CHANGES:
Added support of allowed tags into Mage_Core_Helper_Abstract->htmlEscape() method
Added unquoting autobinded quoted values in SQL adapter
Added validation for selected, but not uploaded files
+ Updated downloader version to 1.2.0
+ Changed app/etc/local.xml* license to AFL
+ Added autoguessing mime type of a file if mimemagic extension is not installed
NOTES:
@@ -129,7 +129,7 @@ public function addAttributeToSort($attribute, $dir='asc')
$this->getSelect()->order($attribute.' '.$dir);
}
else {
- parent::addAttributeToSort($attribute, $dir);
+ parent::addAttributeToSort($attribute, $dir);
}
return $this;
}
@@ -141,7 +141,7 @@ public function addProductFilter($products)
$this->getSelect()->where('links.product_id IN (?)', $products);
}
elseif (is_string($products) || is_numeric($products)) {
- $this->getSelect()->where('links.product_id=?', $products);
+ $this->getSelect()->where('links.product_id=?', $products);
}
return $this;
}
@@ -153,13 +153,14 @@ public function setRandomOrder()
}
/**
- * Deprecated since 1.1.7
+ * Setting group by to exclude duplications in collection
*
- * @param mixed $groupBy
+ * @param string $groupBy
* @return Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Product_Collection
*/
- public function setGroupBy($groupBy)
+ public function setGroupBy($groupBy = 'e.entity_id')
{
+ $this->getSelect()->group($groupBy);
return $this;
}
@@ -70,6 +70,7 @@ public function getItems()
->addProductFilter($this->_getCartProductIds())
->addExcludeProductFilter($ninProductIds)
->setPageSize($this->_maxItemCount-count($items))
+ ->setGroupBy()
->setRandomOrder()
->load();
foreach ($collection as $item) {
Oops, something went wrong.

0 comments on commit 5e6c3b7

Please sign in to comment.