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

// MERGE with 1.4 r7770

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7776 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-07-28 09:20:57 +00:00
parent df255f66c1
commit a875fecb20
968 changed files with 26082 additions and 3937 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/tabs/AdminCatalog.php
-18
View File
@@ -111,15 +111,6 @@ class AdminCatalog extends AdminTab
}
$this->attributeGenerator->postProcess();
}
elseif (isset($_GET['imageresize']))
{
if (!isset($this->imageResize))
{
include_once(PS_ADMIN_DIR.'/tabs/AdminImageResize.php');
$this->imageResize = new AdminImageResize();
}
$this->imageResize->postProcess();
}
$this->adminProducts->postProcess($this->token);
}
@@ -158,15 +149,6 @@ class AdminCatalog extends AdminTab
}
$this->attributeGenerator->displayForm();
}
elseif (isset($_GET['imageresize']))
{
if (!isset($this->imageResize))
{
include_once(PS_ADMIN_DIR.'/tabs/AdminImageResize.php');
$this->imageResize = new AdminImageResize();
}
$this->imageResize->displayForm();
}
elseif (!isset($_GET['editImage']))
{
$home = false;