strk/friendica
1
0
Fork 0
Code Issues Pull requests 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 Häder 2016-09-18 23:21:18 +02:00
commit c825cc8d0d
No known key found for this signature in database
GPG key ID: B72F8185C6C7BD78
691 changed files with 121501 additions and 35639 deletions
Download patch file Download diff file Expand all files Collapse all files

4
mod/poco.php
View file

@ -81,7 +81,7 @@ function poco_init(&$a) {
dbesc(NETWORK_STATUSNET)
);
}
if(dba::is_result($r))
if(dbm::is_result($r))
$totalResults = intval($r[0]['total']);
else
$totalResults = 0;
@ -168,7 +168,7 @@ function poco_init(&$a) {
}
if(is_array($r)) {
if(dba::is_result($r)) {
if(dbm::is_result($r)) {
foreach($r as $rr) {
if (!isset($rr['generation'])) {
if ($global)