From 9098ed0f47b25c23d962f6c67516a60823d2e0e1 Mon Sep 17 00:00:00 2001
From: ahwelp <ahwelp@ahwelp.com>
Date: Wed, 12 Sep 2018 02:48:58 -0300
Subject: [PATCH] Version 0.3

---
 src/RequestResponse/Flash.php | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/RequestResponse/Flash.php b/src/RequestResponse/Flash.php
index 774380f..9a7ec9a 100755
--- a/src/RequestResponse/Flash.php
+++ b/src/RequestResponse/Flash.php
@@ -23,8 +23,8 @@ class Flash{
     ];
 
     public $old_messages = Array();
-
     public $new_messages = Array();
+    public $_flashes = Array();
 
     //SINGLETON==============================================
 
@@ -54,6 +54,10 @@ class Flash{
 
     //=======================================================
 
+    public function merge(){
+        $this->_flashes = array_merge_recursive($this->new_messages, $this->old_messages);
+    }
+
     public function load_to_session(){
         $_SESSION[self::SESSION_NAME] = $this->new_messages;
     }
@@ -80,19 +84,20 @@ class Flash{
         if(!self::has_errors()){
             return Array();
         }
-        return self::getInstance()->old_messages[self::ERROR];
+        return self::getInstance()->_flashes[self::ERROR];
     }
 
     public static function get_infos(){
         if(!self::has_info()){
             return Array();
         }
-        return self::getInstance()->old_messages[self::INFO];
+        return self::getInstance()->_flashes[self::INFO];
     }
 
     public static function has_errors(){
         $instance = self::getInstance();
-        if( array_key_exists(self::ERROR, $instance->old_messages ) ){
+        $instance->merge();
+        if( array_key_exists(self::ERROR, $instance->_flashes ) ){
             return true;
         }else{
             return false;
@@ -101,7 +106,8 @@ class Flash{
 
     public static function has_info(){
         $instance = self::getInstance();
-        if( array_key_exists(self::INFO, $instance->old_messages ) ){
+        $instance->merge();
+        if( array_key_exists(self::INFO, $instance->_flashes ) ){
             return true;
         }else{
             return false;