Merge pull request #10826 from nupplaphil/bug/run_xgettext

[friendica.git] / boot.php

diff --git a/boot.php b/boot.php
index b3b560a0963f0be40495966d4a6a5030bb8eee73..a4d0fe5c735e3c2be51e36115490ff93dc229f62 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -38,7 +38,7 @@ use Friendica\Util\DateTimeFormat;
 
 define('FRIENDICA_PLATFORM',     'Friendica');
 define('FRIENDICA_CODENAME',     'Siberian Iris');
-define('FRIENDICA_VERSION',      '2021.09-dev');
+define('FRIENDICA_VERSION',      '2021.12-dev');
 define('DFRN_PROTOCOL_VERSION',  '2.23');
 define('NEW_TABLE_STRUCTURE_VERSION', 1288);
 
@@ -297,13 +297,11 @@ function notice($s)
                return;
        }
 
-       $a = DI::app();
        if (empty($_SESSION['sysmsg'])) {
                $_SESSION['sysmsg'] = [];
        }
-       if ($a->interactive) {
-               $_SESSION['sysmsg'][] = $s;
-       }
+
+       $_SESSION['sysmsg'][] = $s;
 }
 
 /**
@@ -315,14 +313,15 @@ function notice($s)
  */
 function info($s)
 {
-       $a = DI::app();
+       if (empty($_SESSION)) {
+               return;
+       }
 
        if (empty($_SESSION['sysmsg_info'])) {
                $_SESSION['sysmsg_info'] = [];
        }
-       if ($a->interactive) {
-               $_SESSION['sysmsg_info'][] = $s;
-       }
+
+       $_SESSION['sysmsg_info'][] = $s;
 }
 
 function feed_birthday($uid, $tz)
@@ -380,7 +379,7 @@ function is_site_admin()
 
        $adminlist = explode(',', str_replace(' ', '', $admin_email));
 
-       return local_user() && $admin_email && in_array($a->user['email'] ?? '', $adminlist);
+       return local_user() && $admin_email && DBA::exists('user', ['uid' => $a->getLoggedInUserId(), 'email' => $adminlist]);
 }
 
 /**