This merge brings back dbm::is_result() where I could find it.

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
691 changed files with 128914 additions and 43052 deletions
+2 -2
View File
@@ -23,7 +23,7 @@ function qsearch_init(&$a) {
intval($limit)
);
if(dba::is_result($r)) {
if(dbm::is_result($r)) {
foreach($r as $rr)
$results[] = array( 0, (int) $rr['id'], $rr['name'], '', '');
@@ -38,7 +38,7 @@ function qsearch_init(&$a) {
);
if(dba::is_result($r)) {
if(dbm::is_result($r)) {
foreach($r as $rr)
$results[] = array( (int) $rr['id'], 0, $rr['name'],$rr['url'],$rr['photo']);