X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdirectory.php;h=625f6c95aca781eee24e1a3f895361f8c455e1b6;hb=e4ec867df3377acbec6325e7023b814129981d31;hp=cb233db8983df5ae8f98b68354ed2d359d384bdd;hpb=25e2a849c4cb82c7188f1cd5bcf4c4fb97dadcaa;p=friendica.git

diff --git a/mod/directory.php b/mod/directory.php
index cb233db898..625f6c95ac 100644
--- 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 " );
@@ -104,7 +104,7 @@ function directory_content(&$a) {
 
 			$itemurl = (($rr['addr'] != "") ? $rr['addr'] : $rr['profile_url']);
 
-			$profile_link = z_root() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']);
+			$profile_link = 'profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']);
 
 			$pdesc = (($rr['pdesc']) ? $rr['pdesc'] . '<br />' : '');
 
@@ -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;
 
@@ -158,14 +158,14 @@ function directory_content(&$a) {
 			else {
 				$location_e = $location;
 			}
-			
+
 			$photo_menu = array(array(t("View Profile"), zrl($profile_link)));
 
 			$entry = array(
 				'id' => $rr['id'],
 				'url' => $profile_link,
 				'itemurl' => $itemurl,
-				'thumb' => proxy_url($a->get_cached_avatar_image($rr[$photo]), false, PROXY_SIZE_THUMB),
+				'thumb' => proxy_url($rr[$photo], false, PROXY_SIZE_THUMB),
 				'img_hover' => $rr['name'],
 				'name' => $rr['name'],
 				'details' => $details,