FIX Missing some replacements in website module

Conflicts: htdocs/website/index.php
Dolibarr · Aug 14, 2019 · e1ab508 · e1ab508
1 parent b443b1b
commit e1ab508
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
@@ -92,6 +92,9 @@ function dolWebsiteReplacementOfLinks($website, $content, $removephppart = 0)
 	$content=preg_replace('/(href=")(\/?document\.php\?[^\"]*modulepart=[^\"]*)(\")/', '\1'.DOL_URL_ROOT.'\2\3', $content, -1, $nbrep);
 	$content=preg_replace('/(src=")(\/?document\.php\?[^\"]*modulepart=[^\"]*)(\")/', '\1'.DOL_URL_ROOT.'\2\3', $content, -1, $nbrep);
 
+	// Fix relative link /viewimage.php with correct URL after the DOL_URL_ROOT:  ...href="/viewimage.php?modulepart="
+	$content=preg_replace('/(url\(")(\/?viewimage\.php\?[^\"]*modulepart=[^\"]*)(\")/', '\1'.DOL_URL_ROOT.'\2\3', $content, -1, $nbrep);
+
 	dol_syslog('dolWebsiteReplacementOfLinks end', LOG_DEBUG);
 
 	return $content;
@@ -183,7 +186,7 @@ function dolKeepOnlyPhpCode($str)
  * @param   string  $content    	Content string
  * @param	string	$contenttype	Content type
  * @return  void
- * @see	dolWebsiteReplacementOfLinks()  for function used to replace content in the backoffice context when USEDOLIBARREDITOR is not on
+ * @see	dolWebsiteReplacementOfLinks()  for function used to replace content in the backoffice context.
  */
 function dolWebsiteOutput($content, $contenttype='html')
 {
@@ -226,6 +229,7 @@ function dolWebsiteOutput($content, $contenttype='html')
 		// Fix relative link /viewimage.php with correct URL after the DOL_URL_ROOT: href="/viewimage.php?modulepart=" => href="/dolibarr/viewimage.php?modulepart="
 		$content=preg_replace('/(href=")(\/?viewimage\.php\?[^\"]*modulepart=[^\"]*)(\")/', '\1'.DOL_URL_ROOT.'\2\3', $content, -1, $nbrep);
 		$content=preg_replace('/(src=")(\/?viewimage\.php\?[^\"]*modulepart=[^\"]*)(\")/', '\1'.DOL_URL_ROOT.'\2\3', $content, -1, $nbrep);
+		$content=preg_replace('/(url\(")(\/?viewimage\.php\?[^\"]*modulepart=[^\"]*)(\")/', '\1'.DOL_URL_ROOT.'\2\3', $content, -1, $nbrep);
 
 		// Fix relative link into medias with correct URL after the DOL_URL_ROOT: ../url("medias/
 		$content=preg_replace('/url\((["\']?)medias\//', 'url(\1'.DOL_URL_ROOT.'/viewimage.php?modulepart=medias&file=', $content, -1, $nbrep);