improvements

diff --git a/include/enotify.php b/include/enotify.php
index 4423a36a0890e1d926d10a14eee0419377b59f15..42aee556906f7c911aedf9133ef993df79018cad 100644 (file)
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -74,8 +74,7 @@ function notification($params)
 
        $sender_email = DI::emailer()->getSiteEmailAddress();
 
-       $user = DBA::selectFirst('user', ['nickname', 'page-flags'],
-               ['uid' => $params['uid']]);
+       $user = User::getById($params['uid'], ['nickname', 'page-flags']);
 
        // There is no need to create notifications for forum accounts
        if (!DBA::isResult($user) || in_array($user["page-flags"], [User::PAGE_FLAGS_COMMUNITY, User::PAGE_FLAGS_PRVGROUP])) {

diff --git a/src/Core/Update.php b/src/Core/Update.php
index 2a3b3a68d69ad9b26bcd37cc6a9578ca0ddb8c1a..b1e0a7cf17034d4da9a5af8a259f030dc438b02b 100644 (file)
--- a/src/Core/Update.php
+++ b/src/Core/Update.php
@@ -252,7 +252,7 @@ class Update
                        }
                        $sent[] = $admin['email'];
 
-                       $lang = (($admin['language']) ? $admin['language'] : 'en');
+                       $lang = $admin['language'] ?? 'en';
                        $l10n = DI::l10n()->withLang($lang);
 
                        $preamble = Strings::deindent($l10n->t("