X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fdfrn.php;h=272105128fe07a2ea4c9711a54cdf4d52deb6c67;hb=6ef69ad2dac6938643c8995dcbf39b63a7f235e2;hp=e048e66085c6acfb1a49d0d8e5b740381ccb8a1e;hpb=a8bef370d3148d8a9d0a3ffc5ce906ee0c08d792;p=friendica.git

diff --git a/include/dfrn.php b/include/dfrn.php
index e048e66085..272105128f 100644
--- a/include/dfrn.php
+++ b/include/dfrn.php
@@ -3,7 +3,8 @@
  * @file include/dfrn.php
  * @brief The implementation of the dfrn protocol
  *
- * https://github.com/friendica/friendica/wiki/Protocol
+ * @see https://github.com/friendica/friendica/wiki/Protocol and
+ * https://github.com/friendica/friendica/blob/master/spec/dfrn2.pdf
  */
 
 require_once("include/Contact.php");
@@ -134,7 +135,7 @@ class dfrn {
 					break; // NOTREACHED
 			}
 
-			$r = q("SELECT * FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `contact`.`uid` = %d $sql_extra LIMIT 1",
+			$r = q("SELECT * FROM `contact` WHERE NOT `blocked` AND `contact`.`uid` = %d $sql_extra LIMIT 1",
 				intval($owner_id)
 			);
 
@@ -193,7 +194,7 @@ class dfrn {
 			`sign`.`signed_text`, `sign`.`signature`, `sign`.`signer`
 			FROM `item` USE INDEX (`uid_wall_changed`, `uid_type_changed`) $sql_post_table
 			STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
-			AND NOT `contact`.`blocked`
+			AND (NOT `contact`.`blocked` OR `contact`.`pending`)
 			LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id`
 			WHERE `item`.`uid` = %d AND `item`.`visible` AND NOT `item`.`moderated` AND `item`.`parent` != 0
 			AND `item`.`wall` AND `item`.`changed` > '%s'