From f38483a4e0dfebfe2e2e7c351e804bd03a2dc325 Mon Sep 17 00:00:00 2001 From: rMalie Date: Thu, 26 Apr 2012 14:13:59 +0000 Subject: [PATCH] // Norm git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14912 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/Product.php | 8 ++++---- controllers/admin/AdminShopController.php | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/classes/Product.php b/classes/Product.php index 9cb1a8d94..0c18df07c 100644 --- a/classes/Product.php +++ b/classes/Product.php @@ -2706,12 +2706,12 @@ class ProductCore extends ObjectModel * @param array $product Array with ordered product (quantity, id_product_attribute if applicable) * @return mixed Query result */ - public static function updateQuantity($product, $id_order = null) + public static function updateQuantity() { Tools::displayAsDeprecated(); return false; - } + } /** * @deprecated since 1.5.0 @@ -2723,12 +2723,12 @@ class ProductCore extends ObjectModel * @see StockAvailable if you want to manage available quantities for sale on your shop(s) * */ - public static function reinjectQuantities(&$orderDetail, $quantity, Context $context = null) + public static function reinjectQuantities() { Tools::displayAsDeprecated(); return false; - } + } public static function isAvailableWhenOutOfStock($out_of_stock) { diff --git a/controllers/admin/AdminShopController.php b/controllers/admin/AdminShopController.php index 68e490c61..ee41b1a72 100755 --- a/controllers/admin/AdminShopController.php +++ b/controllers/admin/AdminShopController.php @@ -510,10 +510,10 @@ class AdminShopControllerCore extends AdminController $this->errors = array_unique($this->errors); if (count($this->errors) > 0) - { + { $this->display = 'add'; return; - } + } // datas to import $import_data = Tools::getValue('importData');