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

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

Browse Source
This commit is contained in:
gRoussac
2013-07-17 16:34:03 +02:00
parent d55f31d3b5 2d1ec5f642
commit 3f7bf5c6b0
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/controller/AdminController.php
+2 -2
View File
@@ -803,7 +803,7 @@ class AdminControllerCore extends Controller
if (empty($this->redirect_after))
$this->redirect_after = self::$currentIndex.($parent_id ? '&'.$this->identifier.'='.$object->id : '').'&conf=4&token='.$this->token;
}
Logger::addLog(sprintf($this->l('%s edition'), $this->className), 1, null, $this->className, (int)$this->object->id, true, (int)$this->context->employee->id);
Logger::addLog(sprintf($this->l('%s edition'), $this->className), 1, null, $this->className, (int)$object->id, true, (int)$this->context->employee->id);
}
else
$this->errors[] = Tools::displayError('An error occurred while updating an object.').
@@ -3013,4 +3013,4 @@ class AdminControllerCore extends Controller
return $return;
}
}
}
classes/db/DbPDO.php
-2
View File
@@ -25,8 +25,6 @@
*/
/**
* This class is currently only here for tests
*
* @since 1.5.0
*/
class DbPDOCore extends Db
controllers/admin/AdminImagesController.php
+1
View File
@@ -375,6 +375,7 @@ class AdminImagesControllerCore extends AdminController
|| !Configuration::updateValue('PS_PNG_QUALITY', Tools::getValue('PS_PNG_QUALITY')))
$this->errors[] = Tools::displayError('Unknown error.');
else
$this->confirmations[] = $this->_conf[6];
return parent::postProcess();
}
else
controllers/admin/AdminManufacturersController.php
+3 -1
View File
@@ -511,7 +511,7 @@ class AdminManufacturersControllerCore extends AdminController
$this->fields_value = array(
'name' => Manufacturer::getNameById($address->id_manufacturer),
'alias' => 'manufacturer',
'id_country' => Configuration::get('PS_COUNTRY_DEFAULT')
'id_country' => $address->id_country
);
$this->initToolbar();
@@ -671,6 +671,8 @@ class AdminManufacturersControllerCore extends AdminController
if (Tools::isSubmit('editaddresses'))
$this->display = 'editaddresses';
else if (Tools::isSubmit('updateaddress'))
$this->display = 'editaddresses';
else if (Tools::isSubmit('addaddress'))
$this->display = 'addaddress';
else if (Tools::isSubmit('submitAddaddress'))