DFRN: Contact-id is now stored depending on the author/Some more bugfixes

[friendica.git] / boot.php

diff --git a/boot.php b/boot.php
index 9ee0c98df71444bcc529a25b56dcb944c80d1ce3..4ef30eadac888d2752e558ac93107cde9e4bb7a1 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -36,7 +36,7 @@ define ( 'FRIENDICA_PLATFORM',     'Friendica');
 define ( 'FRIENDICA_CODENAME',     'Asparagus');
 define ( 'FRIENDICA_VERSION',      '3.5-dev' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
-define ( 'DB_UPDATE_VERSION',      1193      );
+define ( 'DB_UPDATE_VERSION',      1194      );
 
 /**
  * @brief Constant with a HTML line break.
@@ -526,11 +526,12 @@ class App {
        private $curl_code;
        private $curl_content_type;
        private $curl_headers;
-       private $curl_redirect_url;
 
        private $cached_profile_image;
        private $cached_profile_picdate;
 
+       private static $a;
+
        /**
         * @brief App constructor.
         */
@@ -711,6 +712,8 @@ class App {
                        }
                }
 
+               self::$a = $this;
+
        }
 
        function get_basepath() {
@@ -735,6 +738,10 @@ class App {
 
        function get_baseurl($ssl = false) {
 
+               // Is the function called statically?
+               if (!is_object($this))
+                       return(self::$a->get_baseurl($ssl));
+
                $scheme = $this->scheme;
 
                if((x($this->config,'system')) && (x($this->config['system'],'ssl_policy'))) {
@@ -910,14 +917,6 @@ class App {
                return $this->curl_headers;
        }
 
-       function set_curl_redirect_url($url) {
-               $this->curl_redirect_url = $url;
-       }
-
-       function get_curl_redirect_url() {
-               return $this->curl_redirect_url;
-       }
-
        function get_cached_avatar_image($avatar_image){
                return $avatar_image;