Cleanup Flash Session

dimak08 · Jul 3, 2016 · 0adfc4c · 0adfc4c
1 parent 0b1b955
commit 0adfc4c
Showing 1 changed file with 7 additions and 11 deletions.
diff --git a/phalcon/flash/session.zep b/phalcon/flash/session.zep
@@ -45,20 +45,16 @@ class Session extends FlashBase implements FlashInterface
 			messages = session->get("_flashMessages");
 
 		if typeof type == "string" {
-			if !isset messages[type] {
-				return [];
-			}
-
-			if !fetch returnMessages, messages[type] {
-				let returnMessages = [];
-			}
+			if fetch returnMessages, messages[type] {
+				if remove === true {
+					unset(messages[type]);
+					session->set("_flashMessages", messages);
+				}
 
-			if remove === true {
-				unset(messages[type]);
-				session->set("_flashMessages", messages);
+				return returnMessages;
 			}
 
-			return returnMessages;
+			return [];
 		}
 
 		if remove === true {