From 3d1176686fc4ff1c57dc1900a616b2e3b2c3be79 Mon Sep 17 00:00:00 2001 From: rMalie Date: Wed, 7 Dec 2011 09:11:43 +0000 Subject: [PATCH] // Fix collection in cartRule git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11018 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/CartRule.php | 2 +- classes/ObjectModel.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/CartRule.php b/classes/CartRule.php index d1afaff90..053034dde 100644 --- a/classes/CartRule.php +++ b/classes/CartRule.php @@ -59,7 +59,7 @@ class CartRuleCore extends ObjectModel public static $definition = array( 'table' => 'cart_rule', - 'identifier' => 'id_cart_rule', + 'primary' => 'id_cart_rule', 'multilang' => true, ); diff --git a/classes/ObjectModel.php b/classes/ObjectModel.php index d10ccf20b..bd42ae379 100644 --- a/classes/ObjectModel.php +++ b/classes/ObjectModel.php @@ -151,7 +151,7 @@ abstract class ObjectModelCore $this->id_shop = Context::getContext()->shop->getID(true); if (!Validate::isTableOrIdentifier($this->identifier) || !Validate::isTableOrIdentifier($this->table)) - throw new PrestashopException('Identifier or table format not valid'); + throw new PrestashopException('Identifier or table format not valid for class '.get_class($this)); if ($id) {