diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php index ebfceab89d9..7e813caa5d6 100644 --- a/htdocs/core/lib/website.lib.php +++ b/htdocs/core/lib/website.lib.php @@ -183,15 +183,16 @@ function dolKeepOnlyPhpCode($str) * * @param string $content Content string * @param string $contenttype Content type + * @param string $contentlabel Content label * @return void * @see dolWebsiteReplacementOfLinks() for function used to replace content in the backoffice context when USEDOLIBARREDITOR is not on */ -function dolWebsiteOutput($content, $contenttype='html') +function dolWebsiteOutput($content, $contenttype='html', $contentlabel='') { global $db, $langs, $conf, $user; global $dolibarr_main_url_root, $dolibarr_main_data_root; - dol_syslog("dolWebsiteOutput start (contenttype=".$contenttype." USEDOLIBARRSERVER=".(defined('USEDOLIBARRSERVER')?'1':'')." USEDOLIBARREDITOR=".(defined('USEDOLIBARREDITOR')?'1':'').')'); + dol_syslog("dolWebsiteOutput start (contenttype=".$contenttype." contentlabel=".$contentlabel." USEDOLIBARRSERVER=".(defined('USEDOLIBARRSERVER')?'1':'')." USEDOLIBARREDITOR=".(defined('USEDOLIBARREDITOR')?'1':'').')'); // Define $urlwithroot $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root)); @@ -294,7 +295,7 @@ function dolWebsiteOutput($content, $contenttype='html') * * @param string $content Content string * @return void - * @see dolWebsiteOutput + * @see dolWebsiteOutput() */ /* function dolWebsiteSaveContent($content) diff --git a/htdocs/core/lib/website2.lib.php b/htdocs/core/lib/website2.lib.php index a67c0f9f142..53f9e5f11c9 100644 --- a/htdocs/core/lib/website2.lib.php +++ b/htdocs/core/lib/website2.lib.php @@ -138,7 +138,7 @@ function dolSavePageContent($filetpl, $object, $objectpage) $tplcontent.= ''."\n"; $tplcontent.= 'id.');'."\n"; $tplcontent.= "// END PHP ?>"."\n"; //var_dump($filetpl);exit;