X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=boot.php;h=a069dcafc974e43312f0f6bf29141983cab40d0e;hb=274ce95d13feb0ff7b150c9a0c3d1db49eb507bb;hp=472814a6db546d9a07e41732bc43533982249a69;hpb=2b9561a7743e761b5c7a84b71bb31b6521997746;p=friendica.git

diff --git a/boot.php b/boot.php
index 472814a6db..a069dcafc9 100644
--- a/boot.php
+++ b/boot.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @file_tag_unsave_file boot.php
+ * @file boot.php
  * This file defines some global constants and includes the central App class.
  */
 
@@ -21,6 +21,7 @@ require_once __DIR__ . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'a
 
 use Friendica\App;
 use Friendica\Core\Addon;
+use Friendica\Core\Cache;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
@@ -39,7 +40,7 @@ define('FRIENDICA_PLATFORM',     'Friendica');
 define('FRIENDICA_CODENAME',     'Asparagus');
 define('FRIENDICA_VERSION',      '3.6-dev');
 define('DFRN_PROTOCOL_VERSION',  '2.23');
-define('DB_UPDATE_VERSION',      1255);
+define('DB_UPDATE_VERSION',      1256);
 define('NEW_UPDATE_ROUTINE_VERSION', 1170);
 
 /**
@@ -121,18 +122,20 @@ define('LOGGER_ALL',             4);
 
 /**
  * @name Cache
+ * @deprecated since version 3.6
+ * @see Cache
  *
  * Cache levels
  * @{
  */
-define('CACHE_MONTH',            0);
-define('CACHE_WEEK',             1);
-define('CACHE_DAY',              2);
-define('CACHE_HOUR',             3);
-define('CACHE_HALF_HOUR',        4);
-define('CACHE_QUARTER_HOUR',     5);
-define('CACHE_FIVE_MINUTES',     6);
-define('CACHE_MINUTE',           7);
+define('CACHE_MONTH',            Cache::MONTH);
+define('CACHE_WEEK',             Cache::WEEK);
+define('CACHE_DAY',              Cache::DAY);
+define('CACHE_HOUR',             Cache::HOUR);
+define('CACHE_HALF_HOUR',        Cache::HALF_HOUR);
+define('CACHE_QUARTER_HOUR',     Cache::QUARTER_HOUR);
+define('CACHE_FIVE_MINUTES',     Cache::FIVE_MINUTES);
+define('CACHE_MINUTE',           Cache::MINUTE);
 /* @}*/
 
 /**
@@ -925,10 +928,10 @@ function public_contact()
 	if (!$public_contact_id && x($_SESSION, 'authenticated')) {
 		if (x($_SESSION, 'my_address')) {
 			// Local user
-			$public_contact_id = intval(Contact::getIdForURL($_SESSION['my_address'], 0));
+			$public_contact_id = intval(Contact::getIdForURL($_SESSION['my_address'], 0, true));
 		} elseif (x($_SESSION, 'visitor_home')) {
 			// Remote user
-			$public_contact_id = intval(Contact::getIdForURL($_SESSION['visitor_home'], 0));
+			$public_contact_id = intval(Contact::getIdForURL($_SESSION['visitor_home'], 0, true));
 		}
 	} elseif (!x($_SESSION, 'authenticated')) {
 		$public_contact_id = false;