Bugfix: XML copy had problems with "&"

[friendica.git] / index.php

diff --git a/index.php b/index.php
index e364389b2cf36ada83138e23c1c3da8f1c9ca82a..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)) {