From 32462b2c106ed87caa3c20e2c3271758daf58fd8 Mon Sep 17 00:00:00 2001 From: skodak Date: Sat, 15 Dec 2007 16:53:39 +0000 Subject: [PATCH] MDL-12592 do not execute theme_setup() if header already printed; merged from MOODLE_19_STABLE --- lib/weblib.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/weblib.php b/lib/weblib.php index 9d38699539..3d17e66aa7 100644 --- a/lib/weblib.php +++ b/lib/weblib.php @@ -3187,6 +3187,11 @@ function theme_setup($theme = '', $params=NULL) { global $CFG, $THEME, $SESSION, $USER, $HTTPSPAGEREQUIRED; +/// Do not mess with THEME if header already printed - this would break all the extra stuff in global $THEME from print_header()!! + if (defined('HEADER_PRINTED')) { + return; + } + if (empty($theme)) { $theme = current_theme(); } @@ -7029,4 +7034,4 @@ function is_in_popup() { // vim:autoindent:expandtab:shiftwidth=4:tabstop=4:tw=140: -?> \ No newline at end of file +?> -- 2.39.5