Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Fix #17475 : Update of previous fix

Browse Source
This commit is contained in:
lmarcouiller
2021-05-07 09:19:44 +02:00
parent 7d649dd90e
commit 0f2ce8687d
3 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7212,7 +7212,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
* @return string Output string after substitutions
* @see complete_substitutions_array(), getCommonSubstitutionArray()
*/
function make_substitutions($text, $substitutionarray, $outputlangs = null, $converttextinhtmlifnecessary = 0, &$moreinheader = null)
function make_substitutions($text, $substitutionarray, $outputlangs = null, $converttextinhtmlifnecessary = 0)
{
global $conf, $langs;
@@ -7317,10 +7317,6 @@ function make_substitutions($text, $substitutionarray, $outputlangs = null, $con
}
$text = str_replace("$key", "$value", $text); // We must keep the " to work when value is 123.5 for example
}
if ($key == '__UNSUBSCRIBE__' && (isset($moreinheader))) {
$tmptext = explode('"', $text);
$moreinheader = "List-Unsubscribe: <".$tmptext[1].">\n";
}
}
return $text;