web/lib/Zend/Controller/Action/Helper/FlashMessenger.php
changeset 1230 68c69c656a2c
parent 807 877f952ae2bd
--- a/web/lib/Zend/Controller/Action/Helper/FlashMessenger.php	Thu May 07 15:10:09 2015 +0200
+++ b/web/lib/Zend/Controller/Action/Helper/FlashMessenger.php	Thu May 07 15:16:02 2015 +0200
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Controller
  * @subpackage Zend_Controller_Action_Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -36,9 +36,9 @@
  * @category   Zend
  * @package    Zend_Controller
  * @subpackage Zend_Controller_Action_Helper
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: FlashMessenger.php 24813 2012-05-22 16:49:24Z adamlundrigan $
+ * @version    $Id$
  */
 class Zend_Controller_Action_Helper_FlashMessenger extends Zend_Controller_Action_Helper_Abstract implements IteratorAggregate, Countable
 {
@@ -150,7 +150,7 @@
             self::$_session->setExpirationHops(1, null, true);
         }
 
-        if (!is_array(self::$_session->{$this->_namespace})) {
+        if (!is_array(self::$_session->{$namespace})) {
             self::$_session->{$namespace} = array();
         }
 
@@ -256,7 +256,7 @@
             $namespace = $this->getNamespace();
         }
         
-        if ($this->hasCurrentMessages()) {
+        if ($this->hasCurrentMessages($namespace)) {
             unset(self::$_session->{$namespace});
             return true;
         }