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

Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release

Browse Source
This commit is contained in:
Vincent Augagneur committed 2013-08-13 11:36:57 +02:00
2 parents b9b03d8259 4a6d1e8ff6
commit a2d005701e
2 files changed
+6 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

controllers/admin/AdminProductsController.php
+5 -5
View File
@@ -359,18 +359,17 @@ class AdminProductsControllerCore extends AdminController
$result = parent::loadObject($opt); $result = parent::loadObject($opt);
if ($result && Validate::isLoadedObject($this->object)) 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); $default_product = new Product((int)$this->object->id, false, null, (int)$this->object->id_shop_default);
$def = ObjectModel::getDefinition($this->object); $def = ObjectModel::getDefinition($this->object);
foreach ($def['fields'] as $field_name => $row) foreach ($def['fields'] as $field_name => $row)
{ {
$fields_array = array(); if (is_array($default_product->$field_name))
if(is_array($default_product->$field_name)) foreach ($default_product->$field_name as $key => $fields_name)
foreach ($fields_array as $key => $fields_name)
$this->object->$field_name[$key] = ObjectModel::formatValue($fields_name, $def['fields'][$field_name]['type']); $this->object->$field_name[$key] = ObjectModel::formatValue($fields_name, $def['fields'][$field_name]['type']);
else 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(); $this->object->loadStockData();
@@ -631,6 +630,7 @@ class AdminProductsControllerCore extends AdminController
{ {
$id_category = (int)Tools::getValue('id_category'); $id_category = (int)Tools::getValue('id_category');
$category_url = empty($id_category) ? '' : '&id_category='.(int)$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; $this->redirect_after = self::$currentIndex.'&conf=1&token='.$this->token.$category_url;
} }
else else
install-dev/models/database.php
+1 -1
View File
@@ -96,7 +96,7 @@ class InstallModelDatabase extends InstallAbstractModel
public function createDatabase($server, $database, $login, $password, $dropit = false) public function createDatabase($server, $database, $login, $password, $dropit = false)
{ {
$class = Db::getClass(); $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) public function getBestEngine($server, $database, $login, $password)