X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=boot.php;h=a070e103eaf2bf052fa9d61b4beb62059f910dac;hb=2768ece6907dafbda96e2b523def4a2a74b86f79;hp=eab34611e2eccaf78240038cacd403cb60f4de24;hpb=8293d5ed0af78ae6cc5629bb1f982a7b29794d32;p=friendica.git diff --git a/boot.php b/boot.php index eab34611e2..a070e103ea 100644 --- a/boot.php +++ b/boot.php @@ -33,13 +33,12 @@ use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\Contact; use Friendica\Model\Notify; -use Friendica\Model\Term; use Friendica\Util\BasePath; use Friendica\Util\DateTimeFormat; define('FRIENDICA_PLATFORM', 'Friendica'); -define('FRIENDICA_CODENAME', 'Dalmatian Bellflower'); -define('FRIENDICA_VERSION', '2020.03-dev'); +define('FRIENDICA_CODENAME', 'Red Hot Poker'); +define('FRIENDICA_VERSION', '2020.06-dev'); define('DFRN_PROTOCOL_VERSION', '2.23'); define('NEW_UPDATE_ROUTINE_VERSION', 1170); @@ -178,29 +177,6 @@ define('NOTIFY_SHARE', Notify\Type::SHARE); define('NOTIFY_SYSTEM', Notify\Type::SYSTEM); /* @}*/ - -/** @deprecated since 2019.03, use Term::UNKNOWN instead */ -define('TERM_UNKNOWN', Term::UNKNOWN); -/** @deprecated since 2019.03, use Term::HASHTAG instead */ -define('TERM_HASHTAG', Term::HASHTAG); -/** @deprecated since 2019.03, use Term::MENTION instead */ -define('TERM_MENTION', Term::MENTION); -/** @deprecated since 2019.03, use Term::CATEGORY instead */ -define('TERM_CATEGORY', Term::CATEGORY); -/** @deprecated since 2019.03, use Term::PCATEGORY instead */ -define('TERM_PCATEGORY', Term::PCATEGORY); -/** @deprecated since 2019.03, use Term::FILE instead */ -define('TERM_FILE', Term::FILE); -/** @deprecated since 2019.03, use Term::SAVEDSEARCH instead */ -define('TERM_SAVEDSEARCH', Term::SAVEDSEARCH); -/** @deprecated since 2019.03, use Term::CONVERSATION instead */ -define('TERM_CONVERSATION', Term::CONVERSATION); - -/** @deprecated since 2019.03, use Term::OBJECT_TYPE_POST instead */ -define('TERM_OBJ_POST', Term::OBJECT_TYPE_POST); -/** @deprecated since 2019.03, use Term::OBJECT_TYPE_PHOTO instead */ -define('TERM_OBJ_PHOTO', Term::OBJECT_TYPE_PHOTO); - /** * @name Gravity * @@ -340,10 +316,6 @@ function info($s) { $a = DI::app(); - if (local_user() && DI::pConfig()->get(local_user(), 'system', 'ignore_info')) { - return; - } - if (empty($_SESSION['sysmsg_info'])) { $_SESSION['sysmsg_info'] = []; }