Merge branch 'develop' into rewrites/dbm_is_result

[friendica.git] / boot.php

diff --git a/boot.php b/boot.php
index c80da23529a5f5b9762d9bb826a48955e76826a7..ccff45f7343295d6b4c29648febce22a55e3735c 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -1548,9 +1548,9 @@ function check_url(App &$a) {
        // We will only change the url to an ip address if there is no existing setting
 
        if(! x($url))
-               $url = set_config('system','url',$a->get_baseurl());
-       if((! link_compare($url,$a->get_baseurl())) && (! preg_match("/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/",$a->get_hostname)))
-               $url = set_config('system','url',$a->get_baseurl());
+               $url = set_config('system','url',App::get_baseurl());
+       if((! link_compare($url,App::get_baseurl())) && (! preg_match("/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/",$a->get_hostname)))
+               $url = set_config('system','url',App::get_baseurl());
 
        return;
 }