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 c741307effadc9887c7c187feb584ef8e6139305..57ca84bf719382b166dca53fa6322f35ae069f34 100644 (file)
--- a/class/error.class.php
+++ b/class/error.class.php
@@ -219,7 +219,7 @@ class ErrorHandler {
 
         // Show the error immediate in case of fatal errors
         if ($iType == SQM_ERROR) {
-            if (!$this->header_sent || (isset($this->Template->values['header_sent']) && !$this->Template->values['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);
             }
@@ -244,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);
         }