From f57931837fb8594c0fff76d1fa184f5aacad68cb Mon Sep 17 00:00:00 2001
From: ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Wed, 16 Apr 2008 09:07:55 +0000
Subject: Fixing the message views

git-svn-id: https://code.elgg.org/elgg/trunk@472 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 views/default/messages/errors/list.php   | 13 +++++++++----
 views/default/messages/list.php          |  2 +-
 views/default/messages/messages/list.php | 13 ++++++++++---
 3 files changed, 20 insertions(+), 8 deletions(-)

(limited to 'views/default/messages')

diff --git a/views/default/messages/errors/list.php b/views/default/messages/errors/list.php
index 9644b7f5a..999912a85 100644
--- a/views/default/messages/errors/list.php
+++ b/views/default/messages/errors/list.php
@@ -14,18 +14,23 @@
 	 * @uses $vars['object'] An array of error messages
 	 */
 
+		if (!empty($vars['object']) && is_array($vars['object'])) {
+
 ?>
 
 	<div class="messages">
 		<div class="messages-errors">
 
 <?php
-		if (!empty($vars['object']) && is_array($vars['object'])) {
 			foreach($vars['object'] as $error) {
 				echo elgg_view('messages/errors/error',array('object' => $error));
 			}
-		}
-
 ?>
 		</div>
-	</div>
\ No newline at end of file
+	</div>
+<?php
+		}
+
+
+
+?>
\ No newline at end of file
diff --git a/views/default/messages/list.php b/views/default/messages/list.php
index 190739a15..10fda8f90 100644
--- a/views/default/messages/list.php
+++ b/views/default/messages/list.php
@@ -14,7 +14,7 @@
 	 * @uses $vars['object'] The array of message registers
 	 */
 
-		if (!empty($vars['object']) && is_array($vars['object'])) {
+		if (!empty($vars['object']) && is_array($vars['object']) && sizeof($vars['object']) > 0) {
 			
 			foreach($vars['object'] as $register => $list ) {
 				echo elgg_view("messages/{$register}/list", array('object' => $list));
diff --git a/views/default/messages/messages/list.php b/views/default/messages/messages/list.php
index b06762843..88d7f0ede 100644
--- a/views/default/messages/messages/list.php
+++ b/views/default/messages/messages/list.php
@@ -14,6 +14,8 @@
 	 * @uses $vars['object'] An array of system messages
 	 */
 
+	if (!empty($vars['object']) && is_array($vars['object'])) {
+
 ?>
 
 	<div class="messages">
@@ -21,12 +23,17 @@
 
 <?php
 
-		if (!empty($vars['object']) && is_array($vars['object'])) {
+		
 			foreach($vars['object'] as $message) {
 				echo elgg_view('messages/messages/message',array('object' => $message));
 			}
-		}
 
 ?>
 		</div>
-	</div>
\ No newline at end of file
+	</div>
+	
+<?php
+
+	}
+
+?>
\ No newline at end of file
-- 
cgit v1.2.3