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

// fixed #PSTEST-142

Browse Source
This commit is contained in:
mMarinetti
2011-12-22 19:21:52 +00:00
parent 508a7e687e
commit 0918a063bb
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/AdminController.php
+3 -2
View File
@@ -230,7 +230,7 @@ class AdminControllerCore extends Controller
protected $_redirect = true; protected $_redirect = true;
/** @var array Name and directory where class image are located */ /** @var array Name and directory where class image are located */
public $fieldImageSettings = null; public $fieldImageSettings = array();
/** @var string Image type */ /** @var string Image type */
public $imageType = 'jpg'; public $imageType = 'jpg';
@@ -544,7 +544,7 @@ class AdminControllerCore extends Controller
{ {
if ($this->deleted) if ($this->deleted)
{ {
if (isset($this->fieldImageSettings)) if (!empty($this->fieldImageSettings))
$res = $object->deleteImage(); $res = $object->deleteImage();
if (!$res) if (!$res)
@@ -2310,6 +2310,7 @@ class AdminControllerCore extends Controller
foreach ($row as $id_shop => $value) foreach ($row as $id_shop => $value)
$assos[] = array('id_object' => (int)$id_asso_object, 'id_'.$type => (int)$id_shop); $assos[] = array('id_object' => (int)$id_asso_object, 'id_'.$type => (int)$id_shop);
} }
return array($assos, $type); return array($assos, $type);
} }