Merge pull request #4534 from tobiasd/20180303-zhcn

[friendica.git] / boot.php

diff --git a/boot.php b/boot.php
index 2a8bf1806a4489b9a55a75fcf8a494949f45cebf..b8b9b0ec288de70711f7cbec8e6d4fd0da7ea743 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -37,9 +37,9 @@ require_once 'include/text.php';
 
 define('FRIENDICA_PLATFORM',     'Friendica');
 define('FRIENDICA_CODENAME',     'Asparagus');
-define('FRIENDICA_VERSION',      '3.6-dev');
+define('FRIENDICA_VERSION',      '3.6-rc');
 define('DFRN_PROTOCOL_VERSION',  '2.23');
-define('DB_UPDATE_VERSION',      1254);
+define('DB_UPDATE_VERSION',      1255);
 define('NEW_UPDATE_ROUTINE_VERSION', 1170);
 
 /**
@@ -925,10 +925,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;