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

// Normalize

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12680 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2012-01-25 14:40:12 +00:00
parent bd7ba6969b
commit c994c25fe1
21 changed files with 202 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/AdminController.php
+9 -6
View File
@@ -661,9 +661,8 @@ class AdminControllerCore extends Controller
}
$this->errors = array_unique($this->errors);
if (count($this->errors) > 0) {
if (count($this->errors) > 0)
return;
}
return $object;
}
@@ -1915,7 +1914,7 @@ class AdminControllerCore extends Controller
$this->boxes = Tools::getValue($this->table.'Box');
break;
}
else if(Tools::isSubmit('submitBulk'))
else if (Tools::isSubmit('submitBulk'))
{
$this->action = 'bulk'.Tools::getValue('select_submitBulk');
$this->boxes = Tools::getValue($this->table.'Box');
@@ -2235,12 +2234,16 @@ class AdminControllerCore extends Controller
/**
* Overload this method for custom checking
*/
protected function _childValidation(){}
protected function _childValidation()
{
}
/**
* Display object details
*/
public function viewDetails(){}
public function viewDetails()
{
}
/**
* Called before deletion
@@ -2429,7 +2432,7 @@ class AdminControllerCore extends Controller
$max_size = isset($this->max_image_size) ? $this->max_image_size : 0;
if ($error = ImageManager::validateUpload($_FILES[$name], Tools::getMaxUploadSize($max_size)))
$this->errors[] = $error;
else if (!$tmp_name = tempnam(_PS_TMP_IMG_DIR_, 'PS') || !move_uploaded_file($_FILES[$name]['tmp_name'], $tmp_name))
else if (!($tmp_name = tempnam(_PS_TMP_IMG_DIR_, 'PS')) || !move_uploaded_file($_FILES[$name]['tmp_name'], $tmp_name))
return false;
else
{