Merge pull request #12725 from annando/api2

[friendica.git] / src / App.php

diff --git a/src/App.php b/src/App.php
index 378ddbc9de032429c864b68d4835b489d6036a88..9df62a4e776bdb49be18ec5e682cd2156364d5f9 100644 (file)
--- a/src/App.php
+++ b/src/App.php
@@ -357,8 +357,6 @@ class App
                $this->profiler->reset();
 
                if ($this->mode->has(App\Mode::DBAVAILABLE)) {
-                       $this->profiler->update($this->config);
-
                        Core\Hook::loadHooks();
                        $loader = (new Config())->createConfigFileManager($this->getBasePath(), $_SERVER);
                        Core\Hook::callAll('load_config', $loader);
@@ -542,25 +540,6 @@ class App
                return Core\Theme::getStylesheetPath($this->getCurrentTheme());
        }
 
-       /**
-        * Sets the base url for use in cmdline programs which don't have
-        * $_SERVER variables
-        */
-       public function checkURL()
-       {
-               $url = $this->config->get('system', 'url');
-
-               // if the url isn't set or the stored url is radically different
-               // than the currently visited url, store the current value accordingly.
-               // "Radically different" ignores common variations such as http vs https
-               // and www.example.com vs example.com.
-               // We will only change the url to an ip address if there is no existing setting
-
-               if (empty($url) || (!Util\Strings::compareLink($url, $this->baseURL->get())) && (!preg_match("/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/", $this->baseURL->getHostname()))) {
-                       $this->config->set('system', 'url', $this->baseURL->get());
-               }
-       }
-
        /**
         * Frontend App script
         *
@@ -659,7 +638,6 @@ class App
                        if ($this->mode->isInstall() && $moduleName !== 'install') {
                                $this->baseURL->redirect('install');
                        } else {
-                               $this->checkURL();
                                Core\Update::check($this->getBasePath(), false);
                                Core\Addon::loadAddons();
                                Core\Hook::loadHooks();