From e82f9f21b5094e303d70b33d380c2ee1e68e8b66 Mon Sep 17 00:00:00 2001
From: ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Wed, 30 Jul 2008 14:31:34 +0000
Subject: Added friends picker callback

git-svn-id: https://code.elgg.org/elgg/trunk@1602 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 views/default/friends/picker.php    | 42 +++++++++++++++++++++++++++++++------
 views/default/friends/tablelist.php |  2 +-
 2 files changed, 37 insertions(+), 7 deletions(-)

(limited to 'views')

diff --git a/views/default/friends/picker.php b/views/default/friends/picker.php
index a17575f05..ca95c22bd 100644
--- a/views/default/friends/picker.php
+++ b/views/default/friends/picker.php
@@ -30,7 +30,14 @@
 				$vars['value'] = array($vars['value']);
 			}
 		}
-
+
+	// Initialise whether we're calling back or not
+		if (isset($vars['callback'])) {
+			$callback = $vars['callback'];
+		} else {
+			$callback = false;
+		}
+		
 	// We need to count the number of friends pickers on the page.
 		global $friendspicker;
 		if (!isset($friendspicker)) $friendspicker = 0;
@@ -53,7 +60,9 @@
 				$users[$letter][$user->name] = $user;
 				
 			}
-		
+		
+	if (!$callback) {
+			
 ?>
 
 <div class="friends_picker">
@@ -62,13 +71,19 @@
 
 	if (isset($vars['content'])) echo $vars['content'];
 
+	
+?>
+
+	<div class="friends_picker_placeholder<?php echo $friendspicker; ?>">
+
+<?php
+	
+	}
+	
 ?>
 
 
 
-
-
-
 	<div class="friendsPicker_wrapper">
 	<div id="friendsPicker<?php echo $friendspicker; ?>">
 		<div class="friendsPicker_container">
@@ -152,8 +167,23 @@
 ?>
 		</div>
 	</div>
+	</div>
+	
+<?php
+
+	if (!$callback) {
+
+?>
+	
 	</div>
-</div>
+</div>
+
+
+<?php
+
+	}
+
+?>
 
 <script type="text/javascript">
 	$(document).ready(function () {
diff --git a/views/default/friends/tablelist.php b/views/default/friends/tablelist.php
index a304e8fda..38f577a2d 100644
--- a/views/default/friends/tablelist.php
+++ b/views/default/friends/tablelist.php
@@ -25,7 +25,7 @@
 			$column = 0;
 			foreach($vars['entities'] as $entity) {
 				if (!($entity instanceof ElggEntity)) $entity = get_entity($entity);
-					if ($entity) {
+					if ($entity instanceof ElggEntity) {
 ?>
 
 			<td style="width:25px">
-- 
cgit v1.2.3