Fix user-contact rows not being updated in Contact\User::updateByContactUpdate

[friendica.git] / src / Module / BaseNotifications.php

diff --git a/src/Module/BaseNotifications.php b/src/Module/BaseNotifications.php
index ea53b9c52a013eef8f5185ad0fa655670e8f55a2..0e39eb651df33cf6a6e36e66e04bddc26c826110 100644 (file)
--- a/src/Module/BaseNotifications.php
+++ b/src/Module/BaseNotifications.php
@@ -28,7 +28,6 @@ use Friendica\Content\Pager;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
-use Friendica\DI;
 use Friendica\Navigation\Notifications\ValueObject\FormattedNotification;
 use Friendica\Network\HTTPException\ForbiddenException;
 
@@ -92,7 +91,7 @@ abstract class BaseNotifications extends BaseModule
                parent::__construct($l10n, $parameters);
 
                if (!local_user()) {
-                       throw new ForbiddenException($this->l10n->t('Permission denied.'));
+                       throw new ForbiddenException($this->t('Permission denied.'));
                }
 
                $page = ($_REQUEST['page'] ?? 0) ?: 1;
@@ -138,14 +137,14 @@ abstract class BaseNotifications extends BaseModule
        protected function printContent(string $header, array $notifications, string $noContent, array $showLink)
        {
                // Get the nav tabs for the notification pages
-               $tabs = self::getTabs();
+               $tabs = $this->getTabs();
 
                // Set the pager
-               $pager = new Pager(DI::l10n(), DI::args()->getQueryString(), self::ITEMS_PER_PAGE);
+               $pager = new Pager($this->l10n, $this->args->getQueryString(), self::ITEMS_PER_PAGE);
 
                $notif_tpl = Renderer::getMarkupTemplate('notifications/notifications.tpl');
                return Renderer::replaceMacros($notif_tpl, [
-                       '$header'        => $header ?? DI::l10n()->t('Notifications'),
+                       '$header'        => $header ?? $this->t('Notifications'),
                        '$tabs'          => $tabs,
                        '$notifications' => $notifications,
                        '$noContent'     => $noContent,
@@ -160,15 +159,15 @@ abstract class BaseNotifications extends BaseModule
         * @return array with with notifications TabBar data
         * @throws Exception
         */
-       private static function getTabs()
+       private function getTabs()
        {
-               $selected = DI::args()->get(1, '');
+               $selected = $this->args->get(1, '');
 
                $tabs = [];
 
                foreach (self::URL_TYPES as $type => $url) {
                        $tabs[] = [
-                               'label'     => DI::l10n()->t(self::PRINT_TYPES[$type]),
+                               'label'     => $this->t(self::PRINT_TYPES[$type]),
                                'url'       => 'notifications/' . $url,
                                'sel'       => (($selected == $url) ? 'active' : ''),
                                'id'        => $type . '-tab',