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

// Fixed potential error when deleting a module

Browse Source
This commit is contained in:
Damien Metzger committed 2013-07-11 18:46:06 +02:00
1 parent a5ee2c2f4f
commit 9af2d3946f
1 file changed
+3 -1
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminModulesController.php
+3 -1
View File
@@ -571,7 +571,8 @@ class AdminModulesControllerCore extends AdminController
else else
{ {
// Uninstall the module before deleting the files, but do not block the process if uninstall returns false // Uninstall the module before deleting the files, but do not block the process if uninstall returns false
$module->uninstall(); if (Module::isInstalled($module->name))
$module->uninstall();
$moduleDir = _PS_MODULE_DIR_.str_replace(array('.', '/', '\\'), array('', '', ''), Tools::getValue('module_name')); $moduleDir = _PS_MODULE_DIR_.str_replace(array('.', '/', '\\'), array('', '', ''), Tools::getValue('module_name'));
$this->recursiveDeleteOnDisk($moduleDir); $this->recursiveDeleteOnDisk($moduleDir);
Tools::redirectAdmin(self::$currentIndex.'&conf=22&token='.$this->token.'&tab_module='.Tools::getValue('tab_module').'&module_name='.Tools::getValue('module_name')); Tools::redirectAdmin(self::$currentIndex.'&conf=22&token='.$this->token.'&tab_module='.Tools::getValue('tab_module').'&module_name='.Tools::getValue('module_name'));
@@ -1106,6 +1107,7 @@ class AdminModulesControllerCore extends AdminController
} }
if (count($module_success)) if (count($module_success))
{ {
die ('kik');
$html = $this->generateHtmlMessage($module_success); $html = $this->generateHtmlMessage($module_success);
$this->confirmations[] = sprintf($this->l('The following module(s) were upgraded successfully:').' %s', $html); $this->confirmations[] = sprintf($this->l('The following module(s) were upgraded successfully:').' %s', $html);
} }