lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix substitution key for constant ok with php 5.3

Browse Source
This commit is contained in:
Laurent Destailleur 2017-11-25 23:16:15 +01:00
parent a48fe55832
commit 7e40ee5e4b
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
htdocs/core/lib/functions.lib.php
View File

@ -5608,13 +5608,13 @@ function make_substitutions($text, $substitutionarray, $outputlangs=null)
{ {
while (preg_match('/__\(([^\)]+)\)__/', $text, $reg)) while (preg_match('/__\(([^\)]+)\)__/', $text, $reg))
{ {
$msgishtml = 0;
if (dol_textishtml($text,1)) $msgishtml = 1;
// If key is __(TranslationKey|langfile)__, then force load of langfile.lang // If key is __(TranslationKey|langfile)__, then force load of langfile.lang
$tmp=explode('|',$reg[1]); $tmp=explode('|',$reg[1]);
if (! empty($tmp[1])) $outputlangs->load($tmp[1]); if (! empty($tmp[1])) $outputlangs->load($tmp[1]);
$msgishtml = 0;
if (dol_textishtml($text,1)) $msgishtml = 1;
$text = preg_replace('/__\('.preg_quote($reg[1], '/').'\)__/', $msgishtml?dol_htmlentitiesbr($outputlangs->transnoentitiesnoconv($reg[1])):$outputlangs->transnoentitiesnoconv($reg[1]), $text); $text = preg_replace('/__\('.preg_quote($reg[1], '/').'\)__/', $msgishtml?dol_htmlentitiesbr($outputlangs->transnoentitiesnoconv($reg[1])):$outputlangs->transnoentitiesnoconv($reg[1]), $text);
} }
} }
@ -5626,8 +5626,9 @@ function make_substitutions($text, $substitutionarray, $outputlangs=null)
$msgishtml = 0; $msgishtml = 0;
if (dol_textishtml($text,1)) $msgishtml = 1; if (dol_textishtml($text,1)) $msgishtml = 1;
$newval=empty($conf->global->$reg[1])?'':$conf->global->$reg[1]; $keyfound = $reg[1];
$text = preg_replace('/__\['.preg_quote($reg[1], '/').'\]__/', $msgishtml?dol_htmlentitiesbr($newval):$newval, $text); $newval=empty($conf->global->$keyfound)?'':$conf->global->$keyfound;
$text = preg_replace('/__\['.preg_quote($keyfound, '/').'\]__/', $msgishtml?dol_htmlentitiesbr($newval):$newval, $text);
} }
// Make substitition for array $substitutionarray // Make substitition for array $substitutionarray