X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=boot.php;h=512238b52eb07b45632fd189f595c9fa122bb17a;hb=6749b2c887552feef3a671c4063425b11a92014a;hp=943d054cbb7da3de7c8cc2b22e47c9663ff6db85;hpb=eefa699bb24ccef155d5a808d132e13017bfe1ff;p=friendica.git

diff --git a/boot.php b/boot.php
index 943d054cbb..512238b52e 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.09-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
  *
@@ -277,10 +253,10 @@ function public_contact()
 	if (!$public_contact_id && !empty($_SESSION['authenticated'])) {
 		if (!empty($_SESSION['my_address'])) {
 			// Local user
-			$public_contact_id = intval(Contact::getIdForURL($_SESSION['my_address'], 0, true));
+			$public_contact_id = intval(Contact::getIdForURL($_SESSION['my_address'], 0, false));
 		} elseif (!empty($_SESSION['visitor_home'])) {
 			// Remote user
-			$public_contact_id = intval(Contact::getIdForURL($_SESSION['visitor_home'], 0, true));
+			$public_contact_id = intval(Contact::getIdForURL($_SESSION['visitor_home'], 0, false));
 		}
 	} elseif (empty($_SESSION['authenticated'])) {
 		$public_contact_id = false;