Make FeedBuilder instance creation independant of the request stack

[github/shaarli/Shaarli.git] / index.php

diff --git a/index.php b/index.php
index 5d689ccb36508aa841611c55cc87fe2e06e61706..980e77044d9aabcaadfb9ad9c7fe56e560597118 100644 (file)
--- a/index.php
+++ b/index.php
@@ -452,15 +452,13 @@ function renderPage($conf, $pluginManager, $bookmarkService, $history, $sessionM
         $feedGenerator = new FeedBuilder(
             $bookmarkService,
             $factory->getFormatter(),
-            $feedType,
             $_SERVER,
-            $_GET,
             $loginManager->isLoggedIn()
         );
         $feedGenerator->setLocale(strtolower(setlocale(LC_COLLATE, 0)));
         $feedGenerator->setHideDates($conf->get('privacy.hide_timestamps') && !$loginManager->isLoggedIn());
         $feedGenerator->setUsePermalinks(isset($_GET['permalinks']) || !$conf->get('feed.rss_permalinks'));
-        $data = $feedGenerator->buildData();
+        $data = $feedGenerator->buildData($feedType, $_GET);
 
         // Process plugin hook.
         $pluginManager->executeHooks('render_feed', $data, array(