Merge remote-tracking branch 'upstream/develop' into 1602-mixed-content

[friendica.git] / index.php

diff --git a/index.php b/index.php
index 2b1053cc1b7b976588d22a69168b5a87d293f010..e364389b2cf36ada83138e23c1c3da8f1c9ca82a 100644 (file)
--- a/index.php
+++ b/index.php
@@ -233,16 +233,7 @@ if(strlen($a->module)) {
        }
 
        /**
-        * If not, next look for module overrides by the theme
-        */
-
-       if((! $a->module_loaded) && (file_exists("view/theme/" . current_theme() . "/mod/{$a->module}.php"))) {
-               include_once("view/theme/" . current_theme() . "/mod/{$a->module}.php");
-               // We will not set module_loaded to true to allow for partial overrides.
-       }
-
-       /**
-        * Finally, look for a 'standard' program module in the 'mod' directory
+        * If not, next look for a 'standard' program module in the 'mod' directory
         */
 
        if((! $a->module_loaded) && (file_exists("mod/{$a->module}.php"))) {
@@ -380,7 +371,7 @@ $a->init_page_end();
 if(x($_SESSION,'visitor_home'))
        $homebase = $_SESSION['visitor_home'];
 elseif(local_user())
-       $homebase = $a->get_baseurl() . '/profile/' . $a->user['nickname'];
+       $homebase = 'profile/' . $a->user['nickname'];
 
 if(isset($homebase))
        $a->page['content'] .= '<script>var homebase="' . $homebase . '" ; </script>';
@@ -416,15 +407,6 @@ if(x($_SESSION,'sysmsg_info')) {
 call_hooks('page_end', $a->page['content']);
 
 
-/**
- *
- * Add a place for the pause/resume Ajax indicator
- *
- */
-
-$a->page['content'] .=  '<div id="pause"></div>';
-
-
 /**
  *
  * Add the navigation (menu) template
@@ -441,10 +423,10 @@ if($a->module != 'install' && $a->module != 'maintenance') {
 
 if($a->is_mobile || $a->is_tablet) {
        if(isset($_SESSION['show-mobile']) && !$_SESSION['show-mobile']) {
-               $link = $a->get_baseurl() . '/toggle_mobile?address=' . curPageURL();
+               $link = 'toggle_mobile?address=' . curPageURL();
        }
        else {
-               $link = $a->get_baseurl() . '/toggle_mobile?off=1&address=' . curPageURL();
+               $link = 'toggle_mobile?off=1&address=' . curPageURL();
        }
        $a->page['footer'] = replace_macros(get_markup_template("toggle_mobile_footer.tpl"), array(
                                '$toggle_link' => $link,