From 9c523cf7ebb1e867d3a363d313b8ba875d34e39c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Tue, 13 Aug 2013 10:21:01 +0200 Subject: [PATCH 1/2] // Log for product deletion was missing --- controllers/admin/AdminProductsController.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index 8fcd84206..24e6b8920 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -359,18 +359,17 @@ class AdminProductsControllerCore extends AdminController $result = parent::loadObject($opt); if ($result && Validate::isLoadedObject($this->object)) { - if (Shop::getContext() == Shop::CONTEXT_SHOP && !$this->object->isAssociatedToShop()) + if (Shop::getContext() == Shop::CONTEXT_SHOP && Shop::isFeatureActive() && !$this->object->isAssociatedToShop()) { $default_product = new Product((int)$this->object->id, false, null, (int)$this->object->id_shop_default); $def = ObjectModel::getDefinition($this->object); foreach ($def['fields'] as $field_name => $row) { - $fields_array = array(); - if(is_array($default_product->$field_name)) - foreach ($fields_array as $key => $fields_name) + if (is_array($default_product->$field_name)) + foreach ($default_product->$field_name as $key => $fields_name) $this->object->$field_name[$key] = ObjectModel::formatValue($fields_name, $def['fields'][$field_name]['type']); else - $this->object->$field_name = ObjectModel::formatValue($this->object->$field_name, $def['fields'][$field_name]['type']); + $this->object->$field_name = ObjectModel::formatValue($default_product->$field_name, $def['fields'][$field_name]['type']); } } $this->object->loadStockData(); @@ -631,6 +630,7 @@ class AdminProductsControllerCore extends AdminController { $id_category = (int)Tools::getValue('id_category'); $category_url = empty($id_category) ? '' : '&id_category='.(int)$id_category; + Logger::addLog(sprintf($this->l('%s deletion'), $this->className), 1, null, $this->className, (int)$object->id, true, (int)$this->context->employee->id); $this->redirect_after = self::$currentIndex.'&conf=1&token='.$this->token.$category_url; } else From 4a6d1e8ff6d43dbb059b6220845218e9e615aaeb Mon Sep 17 00:00:00 2001 From: Damien Metzger Date: Tue, 13 Aug 2013 11:01:54 +0200 Subject: [PATCH 2/2] [-] Installer : changed syntax from $class:func to call_user_func because it seems to be more compliant with old PHP versions --- install-dev/models/database.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install-dev/models/database.php b/install-dev/models/database.php index bb3d78d2d..5ba9dbd84 100644 --- a/install-dev/models/database.php +++ b/install-dev/models/database.php @@ -96,7 +96,7 @@ class InstallModelDatabase extends InstallAbstractModel public function createDatabase($server, $database, $login, $password, $dropit = false) { $class = Db::getClass(); - return $class::createDatabase($server, $login, $password, $database, $dropit); + return call_user_func(array($class, 'createDatabase'), $server, $login, $password, $database, $dropit); } public function getBestEngine($server, $database, $login, $password)