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

// Fix

Browse Source
This commit is contained in:
fSerny
2011-11-21 10:11:27 +00:00
parent 016bc58a04
commit ae1066235a
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminModulesController.php
+5 -1
View File
@@ -481,6 +481,7 @@ class AdminModulesControllerCore extends AdminController
Context::getContext()->shop = new Shop(); Context::getContext()->shop = new Shop();
Configuration::updateValue('RSS_FEED_TITLE', 'lol'); Configuration::updateValue('RSS_FEED_TITLE', 'lol');
} }
}
if (((method_exists($module, $method) && ($echo = $module->{$method}())) || ($echo = ' ')) AND $key == 'configure' AND Module::isInstalled($module->name)) if (((method_exists($module, $method) && ($echo = $module->{$method}())) || ($echo = ' ')) AND $key == 'configure' AND Module::isInstalled($module->name))
{ {
@@ -515,11 +516,15 @@ class AdminModulesControllerCore extends AdminController
} }
$toolbar .= '</table>'; $toolbar .= '</table>';
if (Shop::isFeatureActive() && isset(Context::getContext()->tmpOldShop)) if (Shop::isFeatureActive() && isset(Context::getContext()->tmpOldShop))
{ {
Context::getContext()->shop = clone(Context::getContext()->tmpOldShop); Context::getContext()->shop = clone(Context::getContext()->tmpOldShop);
unset(Context::getContext()->tmpOldShop); unset(Context::getContext()->tmpOldShop);
} }
// Display module configuration
// TODO : Make something cleaner
$this->context->smarty->assign('module_content', $toolbar.'<div class="clear">&nbsp;</div>'.$echo.'<div class="clear">&nbsp;</div>'.$toolbar); $this->context->smarty->assign('module_content', $toolbar.'<div class="clear">&nbsp;</div>'.$echo.'<div class="clear">&nbsp;</div>'.$toolbar);
} }
elseif($echo) elseif($echo)
@@ -536,7 +541,6 @@ class AdminModulesControllerCore extends AdminController
if ($key != 'configure' && isset($_GET['bpay'])) if ($key != 'configure' && isset($_GET['bpay']))
Tools::redirectAdmin('index.php?tab=AdminPayment&token='.Tools::getAdminToken('AdminPayment'.(int)(Tab::getIdFromClassName('AdminPayment')).(int)$this->id_employee)); Tools::redirectAdmin('index.php?tab=AdminPayment&token='.Tools::getAdminToken('AdminPayment'.(int)(Tab::getIdFromClassName('AdminPayment')).(int)$this->id_employee));
} }
}
if (count($module_errors)) if (count($module_errors))
{ {
// If error during module installation, no redirection // If error during module installation, no redirection