Merge pull request #7044 from MrPetovan/task/router

[friendica.git] / src / App.php

diff --git a/src/App.php b/src/App.php
index 328a1a15226652ff8b7cf0d1054b49ff07864088..477e44bf1df2ef011ff5f61047f051e6edbd5f99 100644 (file)
--- a/src/App.php
+++ b/src/App.php
@@ -405,8 +405,6 @@ class App
         * @param bool $ssl Whether to append http or https under BaseURL::SSL_POLICY_SELFSIGN
         *
         * @return string Friendica server base URL
-        *
-        * @deprecated 2019.06 - use BaseURL->get($ssl) instead
         */
        public function getBaseURL($ssl = false)
        {
@@ -508,7 +506,6 @@ class App
                 * being first
                 */
                $this->page['htmlhead'] = Core\Renderer::replaceMacros($tpl, [
-                       '$baseurl'         => $this->getBaseURL(),
                        '$local_user'      => local_user(),
                        '$generator'       => 'Friendica' . ' ' . FRIENDICA_VERSION,
                        '$delitem'         => Core\L10n::t('Delete this item?'),
@@ -561,7 +558,6 @@ class App
 
                $tpl = Core\Renderer::getMarkupTemplate('footer.tpl');
                $this->page['footer'] = Core\Renderer::replaceMacros($tpl, [
-                       '$baseurl' => $this->getBaseURL(),
                        '$footerScripts' => $this->footerScripts,
                ]) . $this->page['footer'];
        }