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

10
include/follow.php
View File

@@ -178,7 +178,7 @@ function new_contact($uid,$url,$interactive = false) {
intval($uid), dbesc(normalise_link($url)), dbesc($ret['network'])
);
if(dba::is_result($r)) {
if(dbm::is_result($r)) {
// update contact
if($r[0]['rel'] == CONTACT_IS_FOLLOWER || ($network === NETWORK_DIASPORA && $r[0]['rel'] == CONTACT_IS_SHARING)) {
q("UPDATE `contact` SET `rel` = %d , `subhub` = %d, `readonly` = 0 WHERE `id` = %d AND `uid` = %d",
@@ -196,7 +196,7 @@ function new_contact($uid,$url,$interactive = false) {
$r = q("select count(*) as total from contact where uid = %d and pending = 0 and self = 0",
intval($uid)
);
if(dba::is_result($r))
if(dbm::is_result($r))
$total_contacts = $r[0]['total'];
if(! service_class_allows($uid,'total_contacts',$total_contacts)) {
@@ -208,7 +208,7 @@ function new_contact($uid,$url,$interactive = false) {
intval($uid),
dbesc($network)
);
if(dba::is_result($r))
if(dbm::is_result($r))
$total_network = $r[0]['total'];
if(! service_class_allows($uid,'total_contacts_' . $network,$total_network)) {
@@ -270,7 +270,7 @@ function new_contact($uid,$url,$interactive = false) {
// pull feed and consume it, which should subscribe to the hub.
proc_run('php',"include/onepoll.php","$contact_id", "force");
proc_run(PRIORITY_MEDIUM, "include/onepoll.php", $contact_id, "force");
// create a follow slap
@@ -295,7 +295,7 @@ function new_contact($uid,$url,$interactive = false) {
intval($uid)
);
if(dba::is_result($r)) {
if(dbm::is_result($r)) {
if(($contact['network'] == NETWORK_OSTATUS) && (strlen($contact['notify']))) {
require_once('include/salmon.php');
slapper($r[0],$contact['notify'],$slap);