Merge pull request #1029 from tobiasd/fix1027

[friendica.git] / index.php

diff --git a/index.php b/index.php
index a1e3282c3eef46d18aec44df22bda21a9e50adaa..335547d74b34e2de9deb2175afc3c25d03efde48 100644 (file)
--- a/index.php
+++ b/index.php
@@ -191,6 +191,10 @@ if(strlen($a->module)) {
        if ($a->module == "stream")
                $a->module = "network";
 
+       // Compatibility with the Firefox App
+       if (($a->module == "users") AND ($a->cmd == "users/sign_in"))
+               $a->module = "login";
+
        $privateapps = get_config('config','private_addons');
 
        if(is_array($a->plugins) && in_array($a->module,$a->plugins) && file_exists("addon/{$a->module}/{$a->module}.php")) {
@@ -460,7 +464,8 @@ if ($_GET["mode"] == "raw") {
        session_write_close();
        exit;
 
-} elseif (get_pconfig(local_user(),'system','infinite_scroll') AND ($_GET["q"] == "network")) {
+} elseif (get_pconfig(local_user(),'system','infinite_scroll')
+          AND ($a->module == "network") AND ($_GET["mode"] != "minimal")) {
        if (is_string($_GET["page"]))
                $pageno = $_GET["page"];
        else
@@ -470,7 +475,11 @@ if ($_GET["mode"] == "raw") {
 
        foreach ($_GET AS $param => $value)
                if (($param != "page") AND ($param != "q"))
-                       $reload_uri .= "&".$param."=".$value;
+                       $reload_uri .= "&".$param."=".urlencode($value);
+
+       if (($a->page_offset != "") AND !strstr($reload_uri, "&offset="))
+               $reload_uri .= "&offset=".urlencode($a->page_offset);
+
 
 $a->page['htmlhead'] .= <<< EOT
 <script type="text/javascript">