X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fcontacts.php;h=dcbadd2bac5def3ddc6f80616ff10da2c5092333;hb=52a2c7eb46ea3b9509e48f29eca6f1c398a85538;hp=585ac1423227b7d5d4878feaa6f5f1c1c73c324f;hpb=bbe53699f26bfa4e4d17da097fd8f2fc14da47dd;p=friendica.git

diff --git a/mod/contacts.php b/mod/contacts.php
index 585ac14232..dcbadd2bac 100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -88,11 +88,11 @@ function contacts_content(&$a) {
 		}
 
 
-		$photo = str_replace('-4.jpg', '' , $r[0]['photo']);
-		$photos = q("SELECT `id` FROM `photo` WHERE `resource-id` = '%s' AND `uid` = %d",
-				dbesc($photo),
-				intval($_SESSION['uid'])
-		);
+//		$photo = str_replace('-4.jpg', '' , $r[0]['photo']);
+//		$photos = q("SELECT `id` FROM `photo` WHERE `resource-id` = '%s' AND `uid` = %d",
+//				dbesc($photo),
+//				intval($_SESSION['uid'])
+//		);
 	
 		if($cmd == 'block') {
 			$blocked = (($orig_record[0]['blocked']) ? 0 : 1);
@@ -113,13 +113,15 @@ function contacts_content(&$a) {
 			$r = q("DELETE FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 				intval($contact_id),
 				intval($_SESSION['uid']));
-			if(count($photos)) {
-				foreach($photos as $p) {
-					q("DELETE FROM `photos` WHERE `id` = %d LIMIT 1",
-						$p['id']);
-				}
-			}
-			if($intval($contact_id))
+
+//			if(count($photos)) {
+//				foreach($photos as $p) {
+//					q("DELETE FROM `photos` WHERE `id` = %d LIMIT 1",
+//						$p['id']);
+//				}
+//			}
+
+			if(intval($contact_id))
 				q("DELETE FROM `item` WHERE `contact-id` = %d LIMIT 1",
 					intval($contact_id)
 				);
@@ -184,7 +186,7 @@ function contacts_content(&$a) {
 		return $o;
 
 	}
-dbg(2);
+
 	if(($a->argc == 2) && ($a->argv[1] == 'all'))
 		$sql_extra = '';
 	else
@@ -212,7 +214,7 @@ dbg(2);
 			break;
 	}
 
-	$r = q("SELECT * FROM `contact` WHERE `uid` = %d $sql_extra $sql_extra2 ",
+	$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `pending` = 0 $sql_extra $sql_extra2 ",
 		intval($_SESSION['uid']));
 
 	if(count($r)) {