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/lockview.php
View File

@@ -52,7 +52,7 @@ function lockview_content(&$a) {
$r = q("SELECT `name` FROM `group` WHERE `id` IN ( %s )",
dbesc(implode(', ', $allowed_groups))
);
if(dba::is_result($r))
if(dbm::is_result($r))
foreach($r as $rr)
$l[] = '<b>' . $rr['name'] . '</b>';
}
@@ -60,7 +60,7 @@ function lockview_content(&$a) {
$r = q("SELECT `name` FROM `contact` WHERE `id` IN ( %s )",
dbesc(implode(', ',$allowed_users))
);
if(dba::is_result($r))
if(dbm::is_result($r))
foreach($r as $rr)
$l[] = $rr['name'];
@@ -70,7 +70,7 @@ function lockview_content(&$a) {
$r = q("SELECT `name` FROM `group` WHERE `id` IN ( %s )",
dbesc(implode(', ', $deny_groups))
);
if(dba::is_result($r))
if(dbm::is_result($r))
foreach($r as $rr)
$l[] = '<b><strike>' . $rr['name'] . '</strike></b>';
}
@@ -78,7 +78,7 @@ function lockview_content(&$a) {
$r = q("SELECT `name` FROM `contact` WHERE `id` IN ( %s )",
dbesc(implode(', ',$deny_users))
);
if(dba::is_result($r))
if(dbm::is_result($r))
foreach($r as $rr)
$l[] = '<strike>' . $rr['name'] . '</strike>';