Merge branch 'master' into tres

Conflicts:
	include/socgraph.php

1 files changed, 9 insertions, 5 deletions

diff --git a/mod/directory.php b/mod/directory.php
index 4ceda293d..2a07208a4 100644
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -274,17 +274,21 @@ function directory_content(&$a) {
 						$arr = array('contact' => $rr, 'entry' => $entry);
 
 						call_hooks('directory_item', $arr);
-			
+
+						unset($profile);
+						unset($location);
+
+						if(! $arr['entry']) {
+							continue;
+						}			
+						
 						if($sort_order == '' && $suggest) {
 							$entries[$addresses[$rr['address']]] = $arr['entry']; // Use the same indexes as originally to get the best suggestion first
 						}
+
 						else {
 							$entries[] = $arr['entry'];
 						}
-						unset($profile);
-						unset($location);
-
-
 					}
 
 					ksort($entries); // Sort array by key so that foreach-constructs work as expected