From: kink <kink@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Tue, 6 Mar 2007 15:43:19 +0000 (+0000)
Subject: use org_title instead of "SquirrelMail" in error_box
X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=commitdiff_plain;h=f6b68e062c88ea1db25f76f60dc6a8bf07d47b45;hp=876fdb605dcb48b44b5c0a3a6f2f106c941e5c20

use org_title instead of "SquirrelMail" in error_box
from Nasmail


git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@12318 7612ce4b-ef26-0410-bec9-ea0150e637f0
---

diff --git a/functions/display_messages.php b/functions/display_messages.php
index 6cdfac59..643aeb6d 100644
--- a/functions/display_messages.php
+++ b/functions/display_messages.php
@@ -141,10 +141,11 @@ function logout_error( $errString, $errTitle = '' ) {
  * @since 1.3.2
  */
 function error_box($string, $link=NULL, $return_output=FALSE) {
-    global $pageheader_sent, $oTemplate;
+    global $pageheader_sent, $oTemplate, $org_title;
 
     $err = _("ERROR");
     do_hook('error_box', $string);
+    if ( !isset($org_title) ) $org_title = 'SquirrelMail';
 
     // check if the page header has been sent; if not, send it!
     //
@@ -153,7 +154,7 @@ function error_box($string, $link=NULL, $return_output=FALSE) {
     // to worry about page headers in that case)
     //
     if (!$return_output && empty($pageheader_sent)) {
-        displayHtmlHeader('SquirrelMail: '.$err);
+        displayHtmlHeader($org_title . ': '.$err);
         $pageheader_sent = TRUE;
         echo create_body();  // this is template-safe (see create_body() function)
     }