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 128914 additions and 43052 deletions
Download patch file Download diff file Expand all files Collapse all files

4
mod/subthread.php
View file

@ -53,7 +53,7 @@ function subthread_content(&$a) {
WHERE `contact`.`self` = 1 AND `contact`.`uid` = %d LIMIT 1",
intval($owner_uid)
);
if(dba::is_result($r))
if(dbm::is_result($r))
$owner = $r[0];
if(! $owner) {
@ -75,7 +75,7 @@ function subthread_content(&$a) {
intval($_SESSION['visitor_id']),
intval($owner_uid)
);
if(dba::is_result($r))
if(dbm::is_result($r))
$contact = $r[0];
}
if(! $contact) {