Friendica/friendica
Friendica/friendica
1
0
Fork 1
mirror of https://git.friendi.ca/friendica/friendica.git synced 2025-06-17 03:25:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename Friendica\Database\dba to Friendica\Database\DBA

Browse source
This commit is contained in:
Hypolite Petovan 2018-07-20 08:19:26 -04:00
parent b6a1df0598
commit af6dbc654f
127 changed files with 1169 additions and 1169 deletions
Download patch file Download diff file Expand all files Collapse all files

10
mod/notifications.php
View file

@ -10,7 +10,7 @@ use Friendica\Content\Nav;
use Friendica\Core\L10n;
use Friendica\Core\NotificationsManager;
use Friendica\Core\System;
use Friendica\Database\dba;
use Friendica\Database\DBA;
use Friendica\Database\DBM;
function notifications_post(App $a)
@ -26,7 +26,7 @@ function notifications_post(App $a)
}
if ($request_id) {
$intro = dba::selectFirst('intro', ['id', 'contact-id', 'fid'], ['id' => $request_id, 'uid' => local_user()]);
$intro = DBA::selectFirst('intro', ['id', 'contact-id', 'fid'], ['id' => $request_id, 'uid' => local_user()]);
if (DBM::is_result($intro)) {
$intro_id = $intro['id'];
@ -42,20 +42,20 @@ function notifications_post(App $a)
$fid = $intro['fid'];
if ($_POST['submit'] == L10n::t('Discard')) {
dba::delete('intro', ['id' => $intro_id]);
DBA::delete('intro', ['id' => $intro_id]);
if (!$fid) {
// The check for blocked and pending is in case the friendship was already approved
// and we just want to get rid of the now pointless notification
$condition = ['id' => $contact_id, 'uid' => local_user(),
'self' => false, 'blocked' => true, 'pending' => true];
dba::delete('contact', $condition);
DBA::delete('contact', $condition);
}
goaway('notifications/intros');
}
if ($_POST['submit'] == L10n::t('Ignore')) {
dba::update('intro', ['ignore' => true], ['id' => $intro_id]);
DBA::update('intro', ['ignore' => true], ['id' => $intro_id]);
goaway('notifications/intros');
}
}