oldkid/friendica
1
0
Fork 0
mirror of https://git.sekbaer.de/Friendica/friendica.git synced 2025-06-16 20:05:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Rename DBM method calls to DBA method calls

Browse source
This commit is contained in:
Hypolite Petovan 2018-07-21 08:40:21 -04:00 • committed by Hypolite Petovan
parent 8ddb94ef06
commit 0ec44f3e8a
153 changed files with 813 additions and 918 deletions
Download patch file Download diff file Expand all files Collapse all files

12
view/theme/frio/theme.php
View file

@ -15,7 +15,7 @@ use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\PConfig;
use Friendica\Core\System;
use Friendica\Database\DBM;
use Friendica\Database\DBA;
use Friendica\Model\Profile;
$frio = 'view/theme/frio';
@ -231,7 +231,7 @@ function frio_remote_nav($a, &$nav)
// user info
$r = q("SELECT `micro` FROM `contact` WHERE `uid` = %d AND `self`", intval($a->user['uid']));
$r[0]['photo'] = (DBM::is_result($r) ? $a->remove_baseurl($r[0]['micro']) : 'images/person-48.jpg');
$r[0]['photo'] = (DBA::is_result($r) ? $a->remove_baseurl($r[0]['micro']) : 'images/person-48.jpg');
$r[0]['name'] = $a->user['username'];
} elseif (!local_user() && remote_user()) {
$r = q("SELECT `name`, `nick`, `micro` AS `photo` FROM `contact` WHERE `id` = %d", intval(remote_user()));
@ -245,9 +245,9 @@ function frio_remote_nav($a, &$nav)
$r = false;
}
if (DBM::is_result($r)) {
if (DBA::is_result($r)) {
$nav['userinfo'] = [
'icon' => (DBM::is_result($r) ? $r[0]['photo'] : 'images/person-48.jpg'),
'icon' => (DBA::is_result($r) ? $r[0]['photo'] : 'images/person-48.jpg'),
'name' => $r[0]['name'],
];
}
@ -310,7 +310,7 @@ function frio_acl_lookup(App $a, &$results)
$total = 0;
$r = q("SELECT COUNT(*) AS `total` FROM `contact`
WHERE `uid` = %d AND NOT `self` AND NOT `pending` $sql_extra ", intval($_SESSION['uid']));
if (DBM::is_result($r)) {
if (DBA::is_result($r)) {
$total = $r[0]['total'];
}
@ -322,7 +322,7 @@ function frio_acl_lookup(App $a, &$results)
$contacts = [];
if (DBM::is_result($r)) {
if (DBA::is_result($r)) {
foreach ($r as $rr) {
$contacts[] = _contact_detail_for_template($rr);
}

8
view/theme/vier/theme.php
View file

@ -16,7 +16,7 @@ use Friendica\Core\L10n;
use Friendica\Core\Config;
use Friendica\Core\PConfig;
use Friendica\Core\System;
use Friendica\Database\DBM;
use Friendica\Database\DBA;
use Friendica\Model\Contact;
use Friendica\Model\GContact;
use Friendica\Model\Profile;
@ -147,7 +147,7 @@ function vier_community_info()
$r = GContact::suggestionQuery(local_user(), 0, 9);
$tpl = get_markup_template('ch_directory_item.tpl');
if (DBM::is_result($r)) {
if (DBA::is_result($r)) {
$aside['$comunity_profiles_title'] = L10n::t('Community Profiles');
$aside['$comunity_profiles_items'] = [];
@ -177,7 +177,7 @@ function vier_community_info()
9
);
if (DBM::is_result($r)) {
if (DBA::is_result($r)) {
$aside['$lastusers_title'] = L10n::t('Last users');
$aside['$lastusers_items'] = [];
@ -383,7 +383,7 @@ function vier_community_info()
$tpl = get_markup_template('ch_connectors.tpl');
if (DBM::is_result($r)) {
if (DBA::is_result($r)) {
$con_services = [];
$con_services['title'] = ["", L10n::t('Connect Services'), "", ""];
$aside['$con_services'] = $con_services;