Merge branch 'master' into develop

[friendica.git] / src / App.php

diff --git a/src/App.php b/src/App.php
index 7ef4e49195e2b1285664d362c8c8d6fceca8695a..f59194077ca1cbd48f943ee5044288402ba36808 100644 (file)
--- a/src/App.php
+++ b/src/App.php
@@ -993,12 +993,6 @@ class App
                        );
                }
 
-               if (strstr($this->query_string, '.well-known/host-meta') && ($this->query_string != '.well-known/host-meta')) {
-                       Module\Special\HTTPException::rawContent(
-                               new HTTPException\NotFoundException()
-                       );
-               }
-
                if (!$this->getMode()->isInstall()) {
                        // Force SSL redirection
                        if ($this->baseURL->checkRedirectHttps()) {
@@ -1105,7 +1099,7 @@ class App
 
                // Compatibility with the Android Diaspora client
                if ($this->module == 'stream') {
-                       $this->internalRedirect('network?f=&order=post');
+                       $this->internalRedirect('network?order=post');
                }
 
                if ($this->module == 'conversations') {
@@ -1113,15 +1107,15 @@ class App
                }
 
                if ($this->module == 'commented') {
-                       $this->internalRedirect('network?f=&order=comment');
+                       $this->internalRedirect('network?order=comment');
                }
 
                if ($this->module == 'liked') {
-                       $this->internalRedirect('network?f=&order=comment');
+                       $this->internalRedirect('network?order=comment');
                }
 
                if ($this->module == 'activity') {
-                       $this->internalRedirect('network/?f=&conv=1');
+                       $this->internalRedirect('network?conv=1');
                }
 
                if (($this->module == 'status_messages') && ($this->cmd == 'status_messages/new')) {