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

12
mod/delegate.php
View File

@@ -26,12 +26,12 @@ function delegate_content(&$a) {
$r = q("select `nickname` from user where uid = %d limit 1",
intval($id)
);
if(dba::is_result($r)) {
if(dbm::is_result($r)) {
$r = q("select id from contact where uid = %d and nurl = '%s' limit 1",
intval(local_user()),
dbesc(normalise_link($a->get_baseurl() . '/profile/' . $r[0]['nickname']))
);
if(dba::is_result($r)) {
if(dbm::is_result($r)) {
q("insert into manage ( uid, mid ) values ( %d , %d ) ",
intval($a->argv[2]),
intval(local_user())
@@ -64,7 +64,7 @@ function delegate_content(&$a) {
dbesc($a->user['email']),
dbesc($a->user['password'])
);
if(dba::is_result($r))
if(dbm::is_result($r))
$full_managers = $r;
$delegates = array();
@@ -75,7 +75,7 @@ function delegate_content(&$a) {
intval(local_user())
);
if(dba::is_result($r))
if(dbm::is_result($r))
$delegates = $r;
$uids = array();
@@ -104,7 +104,7 @@ function delegate_content(&$a) {
$nicknames = array();
if(dba::is_result($r)) {
if(dbm::is_result($r)) {
foreach($r as $rr) {
$nicknames[] = "'" . dbesc(basename($rr['nurl'])) . "'";
}
@@ -118,7 +118,7 @@ function delegate_content(&$a) {
$r = q("select `uid`, `username`, `nickname` from user where nickname in ( $nicks )");
if(dba::is_result($r))
if(dbm::is_result($r))
foreach($r as $rr)
if(! in_array($rr['uid'],$uids))
$potentials[] = $rr;