friendica/dir
6
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'remotes/friendica/master' into moveme

Browse source
This commit is contained in:
Fabrixxm 2012-11-05 09:37:58 +01:00
commit 5b4944fe8e
126 changed files with 1348 additions and 1249 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/delivery.php
View file

@ -323,7 +323,7 @@ function delivery_run(&$argv, &$argc){
WHERE `contact`.`blocked` = 0 AND `contact`.`pending` = 0
AND `contact`.`network` = '%s' AND `user`.`nickname` = '%s'
$sql_extra
AND `user`.`account_expired` = 0 LIMIT 1",
AND `user`.`account_expired` = 0 AND `user`.`account_removed` = 0 LIMIT 1",
dbesc(NETWORK_DFRN),
dbesc($nickname)
);