Quoted posts from Twitter now contain media again

[friendica.git] / boot.php

diff --git a/boot.php b/boot.php
index 473b006407fbe8988bd50db1df6e2a3c60f20975..2ceafea7822befa96f2f6e65c7822ae862fcd4fa 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -30,8 +30,8 @@
 use Friendica\Model\Contact;
 
 define('FRIENDICA_PLATFORM',     'Friendica');
-define('FRIENDICA_CODENAME',     'Siberian Iris');
-define('FRIENDICA_VERSION',      '2022.05-dev');
+define('FRIENDICA_CODENAME',     'Giant Rhubarb');
+define('FRIENDICA_VERSION',      '2022.09-rc');
 define('DFRN_PROTOCOL_VERSION',  '2.23');
 define('NEW_TABLE_STRUCTURE_VERSION', 1288);
 
@@ -87,8 +87,8 @@ define('PRIORITIES', [PRIORITY_CRITICAL, PRIORITY_HIGH, PRIORITY_MEDIUM, PRIORIT
 /* @}*/
 
 // Normally this constant is defined - but not if "pcntl" isn't installed
-if (!defined("SIGTERM")) {
-       define("SIGTERM", 15);
+if (!defined('SIGTERM')) {
+       define('SIGTERM', 15);
 }
 
 /**
@@ -117,6 +117,7 @@ function local_user()
        if (!empty($_SESSION['authenticated']) && !empty($_SESSION['uid'])) {
                return intval($_SESSION['uid']);
        }
+
        return false;
 }
 
@@ -168,18 +169,13 @@ function remote_user()
  * This function save text in session, to be shown to the user at next page load
  *
  * @param string $s - Text of notice
+ *
+ * @return void
+ * @deprecated since version 2022.09, use \Friendica\Navigation\SystemMessages instead
  */
-function notice($s)
+function notice(string $s)
 {
-       if (empty($_SESSION)) {
-               return;
-       }
-
-       if (empty($_SESSION['sysmsg'])) {
-               $_SESSION['sysmsg'] = [];
-       }
-
-       $_SESSION['sysmsg'][] = $s;
+       \Friendica\DI::sysmsg()->addNotice($s);
 }
 
 /**
@@ -188,16 +184,11 @@ function notice($s)
  * This function save text in session, to be shown to the user at next page load
  *
  * @param string $s - Text of notice
+ *
+ * @return void
+ * @deprecated since version 2022.09, use \Friendica\Navigation\SystemMessages instead
  */
-function info($s)
+function info(string $s)
 {
-       if (empty($_SESSION)) {
-               return;
-       }
-
-       if (empty($_SESSION['sysmsg_info'])) {
-               $_SESSION['sysmsg_info'] = [];
-       }
-
-       $_SESSION['sysmsg_info'][] = $s;
+       \Friendica\DI::sysmsg()->addInfo($s);
 }