From 266bcd3652db9be4effff42e730ccb8ee1ffaed1 Mon Sep 17 00:00:00 2001 From: mMarinetti Date: Tue, 17 Jan 2012 10:06:18 +0000 Subject: [PATCH] // report 1.4 fix from #PSCFI-4642 (regex for parsing mail subjects) git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12469 b9a71923-0436-4b27-9f14-aed3839534dd --- controllers/admin/AdminTranslationsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/admin/AdminTranslationsController.php b/controllers/admin/AdminTranslationsController.php index d47cc7099..efb67844a 100644 --- a/controllers/admin/AdminTranslationsController.php +++ b/controllers/admin/AdminTranslationsController.php @@ -1571,7 +1571,7 @@ class AdminTranslationsControllerCore extends AdminController if ($tab2 && isset($tab2[1])) { $tab2[1] = trim(str_replace('\'', '', $tab2[1])); - if (preg_match('/Mail::l\(\''._PS_TRANS_PATTERN_.'\'(\)|,)/s', $tab2[2], $tab3)) + if (preg_match('/Mail::l\(\''._PS_TRANS_PATTERN_.'\'/s', $tab2[2], $tab3)) $tab2[2] = $tab3[1]; $subject_mail[$tab2[1]] = $tab2[2]; }