From f4929b1188b4bc5e92b925ebc44f5ad40bb1a4ed Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Mon, 18 May 2020 13:03:13 +0200 Subject: Make FeedBuilder instance creation independant of the request stack --- index.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'index.php') diff --git a/index.php b/index.php index 5d689ccb..980e7704 100644 --- 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( -- cgit v1.2.3