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 6cdfac59fb7e15719c23e22f49febe86bfcffdea..643aeb6df50b0323300501f67acdc86e390e78e8 100644 (file)
--- 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) {
  * @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);
 
     $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!
     //
 
     // 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)) {
     // 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)
     }
         $pageheader_sent = TRUE;
         echo create_body();  // this is template-safe (see create_body() function)
     }