FIX Content send before header warning

Dolibarr · Aug 14, 2019 · 4a20c99 · 4a20c99
1 parent 6de2118
commit 4a20c99
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
@@ -970,8 +970,10 @@
     		$csscontent.= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
     		$csscontent.= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
     		$csscontent.= "ob_start();\n";
+    		$csscontent.= "if (! headers_sent()) {	/* because file is included inline when in edit mode and we don't want warning */ \n";
     		$csscontent.= "header('Cache-Control: max-age=3600, public, must-revalidate');\n";
     		$csscontent.= "header('Content-type: text/css');\n";
+    		$csscontent.= "}\n";
     		$csscontent.= "// END PHP ?>\n";
 
     		$csscontent.= GETPOST('WEBSITE_CSS_INLINE', 'none');
@@ -1605,6 +1607,7 @@
 	else
 	{
 		setEventMessages($object->error, $object->errors, 'errors');
+		$action = '';
 	}
 }