New helper function for checking plugin version numbers check_plugin_version()

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

diff --git a/class/error.class.php b/class/error.class.php
index 9b023e0e9c5bb50331d0ac57c9aa23b010671748..57ca84bf719382b166dca53fa6322f35ae069f34 100644 (file)
--- a/class/error.class.php
+++ b/class/error.class.php
@@ -63,6 +63,7 @@ class ErrorHandler {
      */
     function HeaderSent() {
         $this->header_sent = true;
+        $this->Template->assign('header_sent', true);
     }
 
     /**
@@ -218,7 +219,7 @@ class ErrorHandler {
 
         // Show the error immediate in case of fatal errors
         if ($iType == SQM_ERROR) {
-            if (!$this->header_sent) {
+            if (isset($this->Template->values['header_sent']) && !$this->Template->values['header_sent']) {
                 // TODO replace this with template that can be assigned
                 displayHtmlHeader(_("Error"),'',false);
             }
@@ -243,7 +244,11 @@ class ErrorHandler {
         }
 
         if (isset($this->Template->values['aErrors']) && count($this->Template->values['aErrors']) > 0) {
-            $this->aErrors = array_merge($this->aErrors, $this->Template->values['aErrors']);
+            foreach ($this->Template->values['aErrors'] as $err) {
+                if (!in_array($err, $this->aErrors, true)) {
+                    $this->aErrors[] = $err;
+                }
+            }
             $this->Template->assign('aErrors',$this->aErrors);
         }