clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

This merge brings back dbm::is_result() where I could find it.

Browse Source 
Merge branch 'develop' of github.com:friendica/friendica into rhaeder-develop

Signed-off-by: Roland Haeder <roland@mxchange.org>
This commit is contained in:
Roland Haeder
2016-09-18 23:21:18 +02:00
parent 432f96b646 8e6f9abedb
commit c825cc8d0d
691 changed files with 128914 additions and 43052 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mod/salmon.php
View File

@@ -169,8 +169,8 @@ function salmon_post(&$a) {
// Have we ignored the person?
// If so we can not accept this post.
//if((dba::is_result($r)) && (($r[0]['readonly']) || ($r[0]['rel'] == CONTACT_IS_FOLLOWER) || ($r[0]['blocked']))) {
if(dba::is_result($r) && $r[0]['blocked']) {
//if((dbm::is_result($r)) && (($r[0]['readonly']) || ($r[0]['rel'] == CONTACT_IS_FOLLOWER) || ($r[0]['blocked']))) {
if(dbm::is_result($r) && $r[0]['blocked']) {
logger('mod-salmon: Ignoring this author.');
http_status_exit(202);
// NOTREACHED
@@ -179,7 +179,7 @@ function salmon_post(&$a) {
// Placeholder for hub discovery.
$hub = '';
$contact_rec = ((dba::is_result($r)) ? $r[0] : null);
$contact_rec = ((dbm::is_result($r)) ? $r[0] : null);
ostatus::import($data,$importer,$contact_rec, $hub);