From 0396becba66d77cb925a7a46a01af74bf519e7e1 Mon Sep 17 00:00:00 2001
From: andi <andi@splitbrain.org>
Date: Sun, 23 Jan 2005 19:29:38 +0100
Subject: allow msg after headers were sent

darcs-hash:20050123182938-9977f-4404c519f6b05550c6ba3d43cea24f246b137dad.gz
---
 inc/common.php | 18 +++++++++++++++---
 style.css      |  3 ---
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/inc/common.php b/inc/common.php
index fd6fb911c..42fcf82c3 100644
--- a/inc/common.php
+++ b/inc/common.php
@@ -142,7 +142,12 @@ function pageinfo(){
 }
 
 /**
- * adds a message to the global message array
+ * print a message
+ *
+ * If HTTP headers were not sent yet the message is added 
+ * to the global message array else it's printed directly
+ * using html_msgarea()
+ * 
  *
  * Levels can be:
  *
@@ -151,6 +156,7 @@ function pageinfo(){
  *  1 success
  *
  * @author Andreas Gohr <andi@splitbrain.org>
+ * @see    html_msgarea
  */
 function msg($message,$lvl=0){
   global $MSG;
@@ -158,8 +164,14 @@ function msg($message,$lvl=0){
   $errors[0]  = 'info';
   $errors[1]  = 'success';
 
-  if(!isset($MSG)) $MSG = array();
-  $MSG[]=array('lvl' => $errors[$lvl], 'msg' => $message);
+  if(!headers_sent){
+    if(!isset($MSG)) $MSG = array();
+    $MSG[]=array('lvl' => $errors[$lvl], 'msg' => $message);
+  }else{
+    $MSG = array();
+    $MSG[]=array('lvl' => $errors[$lvl], 'msg' => $message);
+    html_msgarea();
+  }
 }
 
 /**
diff --git a/style.css b/style.css
index 79cd59468..726803ca5 100644
--- a/style.css
+++ b/style.css
@@ -158,7 +158,6 @@ div.error{
   font-size: 90%;
   margin: 0px;
   padding-left: 3em;
-  height: 16px;
 }
 
 div.info{
@@ -167,7 +166,6 @@ div.info{
   font-size: 90%;
   margin: 0;
   padding-left: 3em;
-  height: 16px;
 }
 
 div.success{
@@ -176,7 +174,6 @@ div.success{
   font-size: 90%;
   margin: 0;
   padding-left: 3em;
-  height: 16px;
 }
 
 /* ---------------------------- Diff rendering --------------------------*/
-- 
cgit v1.2.3