rework autocomplete: update jquery.textcomplete to v1.3.3

[friendica.git] / index.php

diff --git a/index.php b/index.php
index 8471735d016af1fd617d908a614c8ded21013db5..484c276343ba458071530b0e03170d05a78bda9d 100644 (file)
--- a/index.php
+++ b/index.php
@@ -72,7 +72,8 @@ if(!$install) {
                (intval(get_config('system','ssl_policy')) == SSL_POLICY_FULL) AND
                (substr($a->get_baseurl(), 0, 8) == "https://")) {
                header("HTTP/1.1 302 Moved Temporarily");
-               header("location: ".$a->get_baseurl()."/".$a->query_string);
+               header("Location: ".$a->get_baseurl()."/".$a->query_string);
+               exit();
        }
 
        require_once("include/session.php");
@@ -107,7 +108,7 @@ if (x($_SESSION,'authenticated') && !x($_SESSION,'language')) {
        // we didn't loaded user data yet, but we need user language
        $r = q("SELECT language FROM user WHERE uid=%d", intval($_SESSION['uid']));
        $_SESSION['language'] = $lang;
-       if (count($r)>0) $_SESSION['language'] = $r[0]['language'];
+       if (dba::is_result($r)) $_SESSION['language'] = $r[0]['language'];
 }
 
 if((x($_SESSION,'language')) && ($_SESSION['language'] !== $lang)) {
@@ -371,7 +372,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>';
@@ -423,10 +424,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,