Update

[squirrelmail.git] / class / error.class.php

diff --git a/class/error.class.php b/class/error.class.php
index 23a32d8c72a4cf6473f56a7176d1a0847d284c2a..94cd9340ca71dafcd65dfee21d7884f412afc551 100644 (file)
--- a/class/error.class.php
+++ b/class/error.class.php
@@ -5,7 +5,7 @@
  *
  * This contains the custom error handler for SquirrelMail.
  *
- * @copyright © 2005-2006 The SquirrelMail Project Team
+ * @copyright © 2005-2007 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
@@ -177,7 +177,7 @@ class ErrorHandler {
                         }
                         if ($aError['category'] & SQM_ERROR_PLUGIN) {
                             $aErrorCategory[] = 'PLUGIN';
-                            do_hook_function('error_handler_plugin',$aError);
+                            do_hook('error_handler_plugin', $aError);
                             // plugin related error handling inside
                         }
                         //if ($aError['category'] & SQM_ERROR_X) {
@@ -220,7 +220,14 @@ class ErrorHandler {
         // Show the error immediate in case of fatal errors
         if ($iType == SQM_ERROR) {
             if (isset($this->Template->values['header_sent']) && !$this->Template->values['header_sent']) {
-                // TODO replace this with template that can be assigned
+// TODO replace this with template that can be assigned
+// UPDATE: displayHtmlHeader() no longer sends anything
+//         directly to the browser itself and instead 
+//         displays all output through the template file 
+//         "protocol_header" as well as calls to the 
+//         template's header() method, so perhaps the 
+//         above TODO is alleviated?? (however, I don't fully
+//         understand the problem behind the TODO comment myself (Paul))
                 displayHtmlHeader(_("Error"),'',false);
             }
             $this->DisplayErrors();
@@ -235,12 +242,10 @@ class ErrorHandler {
     function saveDelayedErrors () {
         if($this->delayed_errors) {
             // Check for previous delayed errors...
-            if (!$this->delayed_errors) {
-                sqgetGlobalVar('delayed_errors',  $delayed_errors,  SQ_SESSION);
-                if (is_array($delayed_errors)) {
-                    $this->AssignDelayedErrors($delayed_errors);
-                    sqsession_unregister("delayed_errors");
-                }
+            sqgetGlobalVar('delayed_errors',  $delayed_errors,  SQ_SESSION);
+            if (is_array($delayed_errors)) {
+                $this->AssignDelayedErrors($delayed_errors);
+                sqsession_unregister("delayed_errors");
             }
 
             if (count($this->aErrors) > 0) {