buffering output to prevent issues with BOMs in lang, plugins, themes, styles
This commit is contained in:
parent
0e208423b7
commit
d7de5bf76f
@ -68,7 +68,7 @@
|
|||||||
* capture this chars
|
* capture this chars
|
||||||
*/
|
*/
|
||||||
|
|
||||||
//ob_start();
|
ob_start();
|
||||||
|
|
||||||
include_once ($fpath);
|
include_once ($fpath);
|
||||||
|
|
||||||
@ -78,11 +78,8 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//$v = ob_get_contents();
|
ob_end_clean();
|
||||||
//ob_end_clean();
|
|
||||||
|
|
||||||
// if ($v) trigger_error("[lang] <strong>$fpath</strong> produced output", E_USER_WARNING);
|
|
||||||
|
|
||||||
|
|
||||||
$GLOBALS['lang'] = array_merge_recursive($lang, $old_lang);
|
$GLOBALS['lang'] = array_merge_recursive($lang, $old_lang);
|
||||||
|
|
||||||
|
@ -99,7 +99,9 @@
|
|||||||
|
|
||||||
|
|
||||||
if ($errno > 0){
|
if ($errno > 0){
|
||||||
|
ob_start();
|
||||||
include_once($f);
|
include_once($f);
|
||||||
|
ob_end_clean();
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($langload)
|
if ($langload)
|
||||||
|
@ -38,7 +38,9 @@
|
|||||||
// new naming convention. Yeah, I know, just an underscore
|
// new naming convention. Yeah, I know, just an underscore
|
||||||
// instead of the dot, so? It is more "consistent" :D
|
// instead of the dot, so? It is more "consistent" :D
|
||||||
$conf2 = THEMES_DIR . THE_THEME . '/theme.conf.php';
|
$conf2 = THEMES_DIR . THE_THEME . '/theme.conf.php';
|
||||||
|
|
||||||
|
ob_start();
|
||||||
|
|
||||||
if (file_exists($conf2)) {
|
if (file_exists($conf2)) {
|
||||||
include($conf2);
|
include($conf2);
|
||||||
} elseif (file_exists($conf1)) {
|
} elseif (file_exists($conf1)) {
|
||||||
@ -83,6 +85,8 @@
|
|||||||
theme_register_default_widgetsets();
|
theme_register_default_widgetsets();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ob_end_clean();
|
||||||
|
|
||||||
return $theme;
|
return $theme;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user