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

8
mod/profperm.php
View File

@@ -42,7 +42,7 @@ function profperm_content(&$a) {
intval($a->argv[2]),
intval(local_user())
);
if(dba::is_result($r))
if(dbm::is_result($r))
$change = intval($a->argv[2]);
}
@@ -64,7 +64,7 @@ function profperm_content(&$a) {
);
$ingroup = array();
if(dba::is_result($r))
if(dbm::is_result($r))
foreach($r as $member)
$ingroup[] = $member['id'];
@@ -94,7 +94,7 @@ function profperm_content(&$a) {
$members = $r;
$ingroup = array();
if(dba::is_result($r))
if(dbm::is_result($r))
foreach($r as $member)
$ingroup[] = $member['id'];
}
@@ -138,7 +138,7 @@ function profperm_content(&$a) {
dbesc(NETWORK_DFRN)
);
if(dba::is_result($r)) {
if(dbm::is_result($r)) {
$textmode = (($switchtotext && (count($r) > $switchtotext)) ? true : false);
foreach($r as $member) {
if(! in_array($member['id'],$ingroup)) {