Imported from 'hub' code.

[core.git] / inc / classes / main / response / class_BaseResponse.php

diff --git a/inc/classes/main/response/class_BaseResponse.php b/inc/classes/main/response/class_BaseResponse.php
index 7c63857c1a0f78bab5fa32ebc0fad6d2d41afba5..bd7524890de030d6f633c3fd2de06423fd691750 100644 (file)
--- a/inc/classes/main/response/class_BaseResponse.php
+++ b/inc/classes/main/response/class_BaseResponse.php
@@ -2,11 +2,11 @@
 /**
  * A generic request class
  *
- * @author             Roland Haeder <webmaster@ship-simu.org>
+ * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Core Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
+ * @link               http://www.shipsimu.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -181,7 +181,7 @@ class BaseResponse extends BaseFrameworkSystem {
                }
 
                // Are there some error messages?
-               if ($this->countGenericArrayElements('fatal_messages', 'generic', 'message') == 0) {
+               if ((!$this->isValidGenericArrayKey('fatal_messages', 'generic', 'message')) || ($this->countGenericArrayElements('fatal_messages', 'generic', 'message') == 0)) {
                        // Flush the output to the world
                        $this->getWebOutputInstance()->output($this->responseBody);
                } else {