X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=boot.php;h=9c3be4a4292aa14f0f14b80fb8c0814d7f33a468;hb=12396a129824c818c875db25c169567b33ec4cd6;hp=b3b560a0963f0be40495966d4a6a5030bb8eee73;hpb=6354d7c81da4ef440131374f67620633ca4feef1;p=friendica.git diff --git a/boot.php b/boot.php index b3b560a096..9c3be4a429 100644 --- 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.09-rc'); 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]); } /**