Merge pull request #6219 from MrPetovan/task/remove-x

[friendica.git] / src / Module / Feed.php

diff --git a/src/Module/Feed.php b/src/Module/Feed.php
index 5df68f223ed57b93a365f8f1cc8580e306111d70..4c7059c038dc0bb221699f4c3840dcad3606f2bf 100644 (file)
--- a/src/Module/Feed.php
+++ b/src/Module/Feed.php
@@ -28,8 +28,8 @@ class Feed extends BaseModule
        {
                $a = self::getApp();
 
-               $last_update = x($_GET, 'last_update') ? $_GET['last_update'] : '';
-               $nocache     = x($_GET, 'nocache') && local_user();
+               $last_update = defaults($_GET, 'last_update', '');
+               $nocache     = !empty($_GET['nocache']) && local_user();
 
                if ($a->argc < 2) {
                        System::httpExit(400);
@@ -54,7 +54,7 @@ class Feed extends BaseModule
 
                $nickname = $a->argv[1];
                header("Content-type: application/atom+xml");
-               echo OStatus::feed($nickname, $last_update, 10, $type, $nocache);
+               echo OStatus::feed($nickname, $last_update, 10, $type, $nocache, true);
                killme();
        }
 }