Merge pull request #2198 from rabuzarus/2312_code_cleanup

[friendica.git] / mod / directory.php

diff --git a/mod/directory.php b/mod/directory.php
index cb233db8983df5ae8f98b68354ed2d359d384bdd..294a55585df14ed8eca9856edabd395ad1eefb31 100644 (file)
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -57,19 +57,19 @@ function directory_content(&$a) {
 
                $sql_extra = " AND ((`profile`.`name` LIKE '%$search%') OR
                                (`user`.`nickname` LIKE '%$search%') OR
-                               (`pdesc` LIKE '%$search%') OR
-                               (`locality` LIKE '%$search%') OR
-                               (`region` LIKE '%$search%') OR
-                               (`country-name` LIKE '%$search%') OR
-                               (`gender` LIKE '%$search%') OR
-                               (`marital` LIKE '%$search%') OR
-                               (`sexual` LIKE '%$search%') OR
-                               (`about` LIKE '%$search%') OR
-                               (`romance` LIKE '%$search%') OR
-                               (`work` LIKE '%$search%') OR
-                               (`education` LIKE '%$search%') OR
-                               (`pub_keywords` LIKE '%$search%') OR
-                               (`prv_keywords` LIKE '%$search%'))";
+                               (`profile`.`pdesc` LIKE '%$search%') OR
+                               (`profile`.`locality` LIKE '%$search%') OR
+                               (`profile`.`region` LIKE '%$search%') OR
+                               (`profile`.`country-name` LIKE '%$search%') OR
+                               (`profile`.`gender` LIKE '%$search%') OR
+                               (`profile`.`marital` LIKE '%$search%') OR
+                               (`profile`.`sexual` LIKE '%$search%') OR
+                               (`profile`.`about` LIKE '%$search%') OR
+                               (`profile`.`romance` LIKE '%$search%') OR
+                               (`profile`.`work` LIKE '%$search%') OR
+                               (`profile`.`education` LIKE '%$search%') OR
+                               (`profile`.`pub_keywords` LIKE '%$search%') OR
+                               (`profile`.`prv_keywords` LIKE '%$search%'))";
        }
 
        $publish = ((get_config('system','publish_all')) ? '' : " AND `publish` = 1 " );
@@ -130,8 +130,8 @@ function directory_content(&$a) {
 
 
                        // show if account is a community account
-                       // ToDo the other should be also respected, but first we need a good translatiion
-                       // and systemwide consistency for displaying the page type
+                       /// @TODO The other page types should be also respected, but first we need a good 
+                       /// translatiion and systemwide consistency for displaying the page type
                        if((intval($rr['page-flags']) == PAGE_COMMUNITY) OR (intval($rr['page-flags']) == PAGE_PRVGROUP))
                                $community = true;