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

// report 1.4 fix from #PSCFI-4642 (regex for parsing mail subjects)

Browse Source
This commit is contained in:
mMarinetti committed 2012-01-17 10:06:18 +00:00
1 parent 9d9ce7170e
commit 9458bfaaad
1 file changed
+1 -1
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminTranslationsController.php
+1 -1
View File
@@ -1571,7 +1571,7 @@ class AdminTranslationsControllerCore extends AdminController
if ($tab2 && isset($tab2[1])) if ($tab2 && isset($tab2[1]))
{ {
$tab2[1] = trim(str_replace('\'', '', $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]; $tab2[2] = $tab3[1];
$subject_mail[$tab2[1]] = $tab2[2]; $subject_mail[$tab2[1]] = $tab2[2];
} }