From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Sun, 27 Feb 2011 00:07:31 +0000 (+0000)
Subject: fixed the AWHOL state of system messages on admin pages
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=4586dea35c98de2fdc071b7a6e5babbbb7145633;p=lorea%2Felgg.git

fixed the AWHOL state of system messages on admin pages


git-svn-id: http://code.elgg.org/elgg/trunk@8504 36083f99-b078-4883-b0ff-0f9b5a30f544
---

diff --git a/views/default/page/admin.php b/views/default/page/admin.php
index fcf188af1..0738991d3 100644
--- a/views/default/page/admin.php
+++ b/views/default/page/admin.php
@@ -13,19 +13,7 @@
 // Set the content type
 header("Content-type: text/html; charset=UTF-8");
 
-// @todo clean up system messages code
-$messages = null;
-if (count_messages()) {
-	// get messages - try for errors first
-	$messages = system_messages(NULL, "error");
-	if (count($messages["error"]) == 0) {
-		// no errors so grab rest of messages
-		$messages = system_messages(null, "");
-	} else {
-		// we have errors - clear out remaining messages
-		system_messages(null, "");
-	}
-}
+$messages = $vars['sysmessages'];
 
 $notices_html = '';
 if ($notices = elgg_get_admin_notices()) {