color has been dropped as a parameter from (plain_)error_message,

update the code to follow

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

diff --git a/functions/imap_messages.php b/functions/imap_messages.php
index c0732acae4a7c01f61b3f04e0d9223fd5962730c..b9df3669de680ec66300169643cc7e55bec6f006 100755 (executable)
--- a/functions/imap_messages.php
+++ b/functions/imap_messages.php
@@ -906,7 +906,7 @@ function sqimap_get_message($imap_stream, $id, $mailbox, $hide=0) {
         if ($hide == 2) return FALSE;
 
         /* the message was not found, maybe the mailbox was modified? */
-        global $sort, $startMessage, $color;
+        global $sort, $startMessage;
 
         $errmessage = _("The server couldn't find the message you requested.");
 
@@ -915,7 +915,7 @@ function sqimap_get_message($imap_stream, $id, $mailbox, $hide=0) {
         $errmessage .= '<p>'._("Most probably your message list was out of date and the message has been moved away or deleted (perhaps by another program accessing the same mailbox).");
 
         /* this will include a link back to the message list */
-        error_message($errmessage, $mailbox, $sort, (int) $startMessage, $color);
+        error_message($errmessage, $mailbox, $sort, (int) $startMessage);
         exit;
     }
     $bodystructure = implode('',$read);

diff --git a/functions/mime.php b/functions/mime.php
index 11c9f4cfaad3a37e3fe30987624a6becd2e83213..88f4ab14279be5286b3130b6c37684b259403356 100644 (file)
--- a/functions/mime.php
+++ b/functions/mime.php
@@ -65,7 +65,7 @@ function mime_structure ($bodystructure, $flags=array()) {
         $errormessage  = _("SquirrelMail could not decode the bodystructure of the message");
         $errormessage .= '<br />'._("The bodystructure provided by your IMAP server:").'<br /><br />';
         $errormessage .= '<pre>' . htmlspecialchars($read) . '</pre>';
-        plain_error_message( $errormessage, $color );
+        plain_error_message( $errormessage );
         echo '</body></html>';
         exit;
     }

diff --git a/include/options/personal.php b/include/options/personal.php
index 9e390baa292d15657a2e4dc8b652b24292ea9ef9..6c3a06ba47a490f8368967af6e2b796d36e5cdf8 100644 (file)
--- a/include/options/personal.php
+++ b/include/options/personal.php
@@ -36,7 +36,7 @@ define('SMOPT_GRP_TZ', 3);
 function load_optpage_data_personal() {
     global $data_dir, $username, $edit_identity, $edit_name,
            $full_name, $reply_to, $email_address, $signature, $tzChangeAllowed,
-           $color, $timeZone, $domain;
+           $timeZone, $domain;
 
     /* Set the values of some global variables. */
     $full_name = getPref($data_dir, $username, 'full_name');
@@ -179,7 +179,7 @@ function load_optpage_data_personal() {
 
         // TODO: make error user friendly
         if (isset($message)) {
-            plain_error_message($message, $color);
+            plain_error_message($message);
             exit;
         }