dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Merge -> revision 7906

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7909 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-08-05 13:26:44 +00:00
parent e4825ac555
commit 239f92eaf1
55 changed files with 174 additions and 1296 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/AddressFormat.php
+1 -1
View File
@@ -213,7 +213,7 @@ class AddressFormatCore extends ObjectModel
$usedKeyList[] = $patternName;
}
else
$this->_errorFormatList[] = Tools::displayError('This key is used too many times (once allowed').
$this->_errorFormatList[] = Tools::displayError('This key is used too many times (once allowed)').
': '.$patternName;
}
}
classes/CompareProduct.php
+2
View File
@@ -69,6 +69,7 @@ class CompareProduct extends ObjectModel
$compareProducts = null;
if ($results)
foreach($results as $result)
$compareProducts[] = $result['id_product'];
@@ -129,6 +130,7 @@ class CompareProduct extends ObjectModel
$compareProducts = null;
if ($results)
foreach($results as $result)
$compareProducts[] = $result['id_product'];
classes/ObjectModel.php
+4 -4
View File
@@ -860,12 +860,12 @@ abstract class ObjectModelCore
* @param $id_entity entity id
* @return boolean
*/
public static function existsInDatabase($id_entity)
public static function existsInDatabase($id_entity, $table)
{
$row = Db::getInstance()->getRow('
SELECT `id_'.self::$table.'`
FROM `'._DB_PREFIX_.self::$table.'` e
WHERE e.`id_'.self::$table.'` = '.(int)($id_entity));
SELECT `id_'.$table.'`
FROM `'._DB_PREFIX_.$table.'` e
WHERE e.`id_'.$table.'` = '.(int)($id_entity));
return isset($row['id_product']);
}
classes/Product.php
+1
View File
@@ -2780,6 +2780,7 @@ class ProductCore extends ObjectModel
public static function getProductsProperties($id_lang, $query_result)
{
$resultsArray = array();
if(is_array($query_result))
foreach ($query_result AS $row)
if ($row2 = Product::getProductProperties($id_lang, $row))
$resultsArray[] = $row2;