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

6
include/contact_widgets.php
View File

@@ -93,7 +93,7 @@ function networks_widget($baseurl,$selected = '') {
);
$nets = array();
if(dba::is_result($r)) {
if(dbm::is_result($r)) {
require_once('include/contact_selectors.php');
foreach($r as $rr) {
if($rr['network'])
@@ -204,13 +204,13 @@ function common_friends_visitor_widget($profile_uid) {
dbesc(normalise_link(get_my_url())),
intval($profile_uid)
);
if(dba::is_result($r))
if(dbm::is_result($r))
$cid = $r[0]['id'];
else {
$r = q("select id from gcontact where nurl = '%s' limit 1",
dbesc(normalise_link(get_my_url()))
);
if(dba::is_result($r))
if(dbm::is_result($r))
$zcid = $r[0]['id'];
}
}