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>
2016-09-18 23:21:18 +02:00
parent 432f96b646 8e6f9abedb
commit c825cc8d0d
691 changed files with 128914 additions and 43052 deletions
--- a/include/session.php
+++ b/include/session.php
@@ -17,7 +17,7 @@ function ref_session_read ($id) {
 	if(x($id))
 		$r = q("SELECT `data` FROM `session` WHERE `sid`= '%s'", dbesc($id));

-	if(dba::is_result($r)) {
+	if(dbm::is_result($r)) {
 		$session_exists = true;
 		return $r[0]['data'];
 	} else {