summaryrefslogtreecommitdiff
path: root/inc/html.php
diff options
context:
space:
mode:
authorMichael Hamann <michael@content-space.de>2011-01-10 21:54:58 +0100
committerMichael Hamann <michael@content-space.de>2011-01-10 22:23:23 +0100
commitcc58224cff540373081dcde9c64d00efbf0fbddc (patch)
tree0156a541c21223af83e0a4b51d2656d7f563675c /inc/html.php
parentbf0c93c21103a02f9efe4c427b9fefd6c5732666 (diff)
downloadrpg-cc58224cff540373081dcde9c64d00efbf0fbddc.tar.gz
rpg-cc58224cff540373081dcde9c64d00efbf0fbddc.tar.bz2
Fix msg() calls when messages have already been printed
This commit fixes two bugs that occurred when msg() was called after html_msgarea() had already been called. - the $MSG array is now cleared when it has been printed (otherwise $MSG has been printed again when another msg() call was done) - headers_sent() didn't work for me, it always reported false although html_msgarea() had already been called which might be explainable with output buffering. This makes msg() now depend on the first call of html_msgarea() or headers_sent() in order to not to break msg() in ajax requests etc.
Diffstat (limited to 'inc/html.php')
-rw-r--r--inc/html.php7
1 files changed, 6 insertions, 1 deletions
diff --git a/inc/html.php b/inc/html.php
index 4e3744fd1..b6c5cc7ba 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -1034,7 +1034,10 @@ function html_conflict($text,$summary){
* @author Andreas Gohr <andi@splitbrain.org>
*/
function html_msgarea(){
- global $MSG;
+ global $MSG, $MSG_shown;
+ // store if the global $MSG has already been shown and thus HTML output has been started
+ $MSG_shown = true;
+
if(!isset($MSG)) return;
$shown = array();
@@ -1046,6 +1049,8 @@ function html_msgarea(){
print '</div>';
$shown[$hash] = 1;
}
+
+ unset($GLOBALS['MSG']);
}
/**