Diaspora in AP - and changed function name

[friendica.git] / index.php

diff --git a/index.php b/index.php
index 41e177ce3bedf76da20f0d9b46a0d78287ed5c8e..a62b7a2ea1ff2e5cc52390857ee1294408ebf541 100644 (file)
--- a/index.php
+++ b/index.php
@@ -107,7 +107,7 @@ if (x($_SESSION, 'language') && ($_SESSION['language'] !== $lang)) {
        L10n::loadTranslationTable($lang);
 }
 
-if ((x($_GET,'zrl')) && $a->mode == App::MODE_NORMAL) {
+if (!empty($_GET['zrl']) && $a->mode == App::MODE_NORMAL) {
        $a->query_string = Profile::stripZrls($a->query_string);
        if (!local_user()) {
                // Only continue when the given profile link seems valid
@@ -215,6 +215,10 @@ if (strlen($a->module)) {
         * First see if we have an addon which is masquerading as a module.
         */
 
+       if ($a->module == 'object') {
+               $a->module = 'display';
+       }
+
        // Compatibility with the Android Diaspora client
        if ($a->module == 'stream') {
                goaway('network?f=&order=post');