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

[-] BO : Fix error returned when first import of a localisation pack

Browse Source
This commit is contained in:
gRoussac
2013-09-03 18:20:58 +02:00
parent 5d8e187faa
commit 6daf8ebbfa
5 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/controller/AdminController.php
+5 -1
View File
@@ -726,6 +726,8 @@ class AdminControllerCore extends Controller
*/
public function processAdd()
{
if (!isset($this->className) || empty($this->className))
return false;
/* Checking fields validity */
$this->validateRules();
if (count($this->errors) <= 0)
@@ -1142,6 +1144,8 @@ class AdminControllerCore extends Controller
*/
protected function loadObject($opt = false)
{
if (!isset($this->className) || empty($this->className))
return true;
$id = (int)Tools::getValue($this->identifier);
if ($id && Validate::isUnsignedId($id))
{
@@ -2400,7 +2404,7 @@ class AdminControllerCore extends Controller
public function getFieldValue($obj, $key, $id_lang = null)
{
if ($id_lang)
$default_value = ($obj->id && isset($obj->{$key}[$id_lang])) ? $obj->{$key}[$id_lang] : false;
$default_value = (isset($obj->id) && $obj->id && isset($obj->{$key}[$id_lang])) ? $obj->{$key}[$id_lang] : false;
else
$default_value = isset($obj->{$key}) ? $obj->{$key} : false;