From d1b9b9fbff88eefb0e7ad416307d74e8433f49fa Mon Sep 17 00:00:00 2001 From: tDidierjean Date: Mon, 23 Jan 2012 15:14:00 +0000 Subject: [PATCH] [-] BO : fix AdminTranslations parsing of helper files --- controllers/admin/AdminTranslationsController.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/controllers/admin/AdminTranslationsController.php b/controllers/admin/AdminTranslationsController.php index 9d47f49ba..554a641a7 100644 --- a/controllers/admin/AdminTranslationsController.php +++ b/controllers/admin/AdminTranslationsController.php @@ -917,14 +917,17 @@ class AdminTranslationsControllerCore extends AdminController foreach ($tabs as $tab) if (preg_match('/^(.*)\.php$/', $tab) && file_exists($tpl = _PS_ADMIN_CONTROLLER_DIR_.$tab)) { + $prefix_key = basename($tab); // -4 becomes -14 to remove the ending "Controller.php" from the filename - $prefix_key = basename(substr($tab, 0, -14)); + if (strpos($tab, 'Controller.php') !== false) + $prefix_key = basename(substr($tab, 0, -14)); + elseif (strpos($tab, 'Helper') !== false) + $prefix_key = 'Helper'; // @todo this is retrocompatible, but we should not leave this - if ( $prefix_key == 'Admin') + if ($prefix_key == 'Admin') $prefix_key = 'AdminController'; - elseif ($prefix_key == 'helper' || $prefix_key == 'Hel') - $prefix_key = 'Helper'; + $fd = fopen($tpl, 'r'); $content = fread($fd, filesize($tpl)); fclose($fd);