X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fdfrn.php;h=272105128fe07a2ea4c9711a54cdf4d52deb6c67;hb=6ef69ad2dac6938643c8995dcbf39b63a7f235e2;hp=67cef59d956ccbe037a060e272ba9f83a1439c97;hpb=754de768f24872e2edf984fc22e51db70b26026b;p=friendica.git diff --git a/include/dfrn.php b/include/dfrn.php index 67cef59d95..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"); @@ -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'