check if there are any messages before grabbing them in elgg_view_page()

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

diff --git a/engine/lib/views.php b/engine/lib/views.php
index 3385e230c1ff899f151fe692ffb3b551a64e3ea7..09653e11db2599e7c398c701db8fbdddf0563c44 100644 (file)
--- a/engine/lib/views.php
+++ b/engine/lib/views.php
@@ -1308,15 +1308,17 @@ function autoregister_views($view_base, $folder, $base_location_path, $viewtype)
  * @since  1.8
  */
 function elgg_view_page($title, $body, $page_shell = 'default', $vars = array()) {
-       // get messages - try for errors first
-       $sysmessages = system_messages(NULL, "errors");
 
-       if (count($sysmessages["errors"]) == 0) {
-               // no errors so grab rest of messages
-               $sysmessages = system_messages(null, "");
-       } else {
-               // we have errors - clear out remaining messages
-               system_messages(null, "");
+       if (count_messages()) {
+               // get messages - try for errors first
+               $sysmessages = system_messages(NULL, "errors");
+               if (count($sysmessages["errors"]) == 0) {
+                       // no errors so grab rest of messages
+                       $sysmessages = system_messages(null, "");
+               } else {
+                       // we have errors - clear out remaining messages
+                       system_messages(null, "");
+               }
        }
 
        $vars['title'] = $title;