fixed zero uid in imported contact photo

[friendica.git] / mod / directory.php

diff --git a/mod/directory.php b/mod/directory.php
index 2dd4b15d98b650b5604bd4cb7681bd7bf3f95590..dd80ef2b8ab994d2e2e2783a583ae0fc1a89e547 100644 (file)
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -4,19 +4,19 @@ function directory_init(&$a) {
 }
 
 function directory_content(&$a) {
-dbg(2);
+
        $search = ((x($_GET,'search')) ? notags(trim($_GET['search'])) : '');
 
        $tpl .= file_get_contents('view/directory_header.tpl');
 
        $o .= replace_macros($tpl, array(
-               '$search' => $search
-
+               '$search' => $search,
+               '$finding' => (strlen($search) ? "<h4>Finding: '$search'</h4>" : "")
        ));
 
        if($search)
                $search = dbesc($search);
-       $sql_extra = ((strlen($search)) ? " AND MATCH (`profile`.`name`, `user`.`nickname`, `locality`,`region`,`country-name`,`gender`,`marital`,`sexual`,`about`,`romance`,`employer`,`school`) AGAINST ('$search' IN BOOLEAN MODE) " : "");
+       $sql_extra = ((strlen($search)) ? " AND MATCH (`profile`.`name`, `user`.`nickname`, `locality`,`region`,`country-name`,`gender`,`marital`,`sexual`,`about`,`romance`,`work`,`education`) AGAINST ('$search' IN BOOLEAN MODE) " : "");
 
 
        $r = q("SELECT COUNT(*) AS `total` FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` WHERE `is-default` = 1 AND `publish` = 1 AND `user`.`blocked` = 0 $sql_extra ");
@@ -40,6 +40,7 @@ dbg(2);
 
                foreach($r as $rr) {
 
+
                        $profile_link = $a->get_baseurl() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']);
                        $details = '';
                        if(strlen($rr['locality']))