bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Merge remote-tracking branch 'friendica/develop' into bug/fix-diaspora-people-links

Browse source 
# Conflicts:
#	include/follow.php
This commit is contained in:
Hypolite Petovan 2016-12-20 12:50:36 -05:00
commit e8e1f9253d
148 changed files with 12178 additions and 11976 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mod/receive.php
View file

@ -34,7 +34,7 @@ function receive_post(&$a) {
$r = q("SELECT * FROM `user` WHERE `guid` = '%s' AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1",
dbesc($guid)
);
if(! count($r))
if(! dbm::is_result($r))
http_status_exit(500);
$importer = $r[0];