clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

17
src/Model/Event.php
View File

@@ -12,7 +12,6 @@ use Friendica\Core\L10n;
use Friendica\Core\PConfig;
use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\Database\DBM;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Map;
@@ -267,11 +266,11 @@ class Event extends BaseObject
if ($event['id']) {
// has the event actually changed?
$existing_event = DBA::selectFirst('event', ['edited'], ['id' => $event['id'], 'uid' => $event['uid']]);
if (!DBM::is_result($existing_event) || ($existing_event['edited'] === $event['edited'])) {
if (!DBA::is_result($existing_event) || ($existing_event['edited'] === $event['edited'])) {
$item = Item::selectFirst(['id'], ['event-id' => $event['id'], 'uid' => $event['uid']]);
return DBM::is_result($item) ? $item['id'] : 0;
return DBA::is_result($item) ? $item['id'] : 0;
}
$updated_fields = [
@@ -289,7 +288,7 @@ class Event extends BaseObject
DBA::update('event', $updated_fields, ['id' => $event['id'], 'uid' => $event['uid']]);
$item = Item::selectFirst(['id'], ['event-id' => $event['id'], 'uid' => $event['uid']]);
if (DBM::is_result($item)) {
if (DBA::is_result($item)) {
$object = '<object><type>' . xmlify(ACTIVITY_OBJ_EVENT) . '</type><title></title><id>' . xmlify($event['uri']) . '</id>';
$object .= '<content>' . xmlify(self::getBBCode($event)) . '</content>';
$object .= '</object>' . "\n";
@@ -470,7 +469,7 @@ class Event extends BaseObject
intval($event_id)
);
if (DBM::is_result($r)) {
if (DBA::is_result($r)) {
$return = self::removeDuplicates($r);
}
@@ -519,7 +518,7 @@ class Event extends BaseObject
dbesc($event_params["adjust_finish"])
);
if (DBM::is_result($r)) {
if (DBA::is_result($r)) {
$return = self::removeDuplicates($r);
}
@@ -540,7 +539,7 @@ class Event extends BaseObject
$fmt = L10n::t('l, F j');
foreach ($event_result as $event) {
$item = Item::selectFirst(['plink', 'author-name', 'author-avatar', 'author-link'], ['id' => $event['itemid']]);
if (DBM::is_result($item)) {
if (DBA::is_result($item)) {
$event = array_merge($event, $item);
}
@@ -738,7 +737,7 @@ class Event extends BaseObject
}
$events = DBA::select('event', $fields, $conditions);
if (DBM::is_result($events)) {
if (DBA::is_result($events)) {
$return = DBA::toArray($events);
}
@@ -762,7 +761,7 @@ class Event extends BaseObject
$process = false;
$user = DBA::selectFirst('user', ['timezone'], ['uid' => $uid]);
if (DBM::is_result($user)) {
if (DBA::is_result($user)) {
$timezone = $user['timezone'];
}