Attempt fix for issue #1490 with notice queued by session sometimes n…

…ot getting displayed
ryancramerdesign · Nov 6, 2015 · aff0f01 · aff0f01
1 parent 96b71af
commit aff0f01
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/wire/core/Session.php b/wire/core/Session.php
@@ -114,7 +114,7 @@ public function __construct() {
 				list($text, $flags) = $item;
 				parent::$type($text, $flags); 
 			}
-			$this->remove($type);
+			// $this->remove($type);
 		}
 
 		$this->setTrackChanges(true);
@@ -749,4 +749,14 @@ public function getHistory() {
 		return $value; 
 	}
 
+	/**
+	 * Remove queued notices
+	 * 
+	 */
+	public function removeNotices() {
+		foreach(array('message', 'error', 'warning') as $type) {
+			$this->remove($type);
+		}
+	}
+
 }
diff --git a/wire/core/admin.php b/wire/core/admin.php
@@ -146,5 +146,6 @@ function _checkForHttpHostError($config) {
 } else {
 	if(!strlen($content)) $content = '<p>' . __('The process returned no content.') . '</p>';
 	require($config->paths->adminTemplates . 'default.php'); 
+	$session->removeNotices();
 }