aboutsummaryrefslogtreecommitdiffhomepage
path: root/index.php
diff options
context:
space:
mode:
authorArthurHoaro <arthur@hoa.ro>2020-05-18 13:03:13 +0200
committerArthurHoaro <arthur@hoa.ro>2020-07-23 21:19:21 +0200
commitf4929b1188b4bc5e92b925ebc44f5ad40bb1a4ed (patch)
tree63c83dc7b5e4663f8e976485f0478eb37b0f77b6 /index.php
parentc56a540c6ef211cd9cb0189ba09911bb77696f28 (diff)
downloadShaarli-f4929b1188b4bc5e92b925ebc44f5ad40bb1a4ed.tar.gz
Shaarli-f4929b1188b4bc5e92b925ebc44f5ad40bb1a4ed.tar.zst
Shaarli-f4929b1188b4bc5e92b925ebc44f5ad40bb1a4ed.zip
Make FeedBuilder instance creation independant of the request stack
Diffstat (limited to 'index.php')
-rw-r--r--index.php4
1 files changed, 1 insertions, 3 deletions
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
452 $feedGenerator = new FeedBuilder( 452 $feedGenerator = new FeedBuilder(
453 $bookmarkService, 453 $bookmarkService,
454 $factory->getFormatter(), 454 $factory->getFormatter(),
455 $feedType,
456 $_SERVER, 455 $_SERVER,
457 $_GET,
458 $loginManager->isLoggedIn() 456 $loginManager->isLoggedIn()
459 ); 457 );
460 $feedGenerator->setLocale(strtolower(setlocale(LC_COLLATE, 0))); 458 $feedGenerator->setLocale(strtolower(setlocale(LC_COLLATE, 0)));
461 $feedGenerator->setHideDates($conf->get('privacy.hide_timestamps') && !$loginManager->isLoggedIn()); 459 $feedGenerator->setHideDates($conf->get('privacy.hide_timestamps') && !$loginManager->isLoggedIn());
462 $feedGenerator->setUsePermalinks(isset($_GET['permalinks']) || !$conf->get('feed.rss_permalinks')); 460 $feedGenerator->setUsePermalinks(isset($_GET['permalinks']) || !$conf->get('feed.rss_permalinks'));
463 $data = $feedGenerator->buildData(); 461 $data = $feedGenerator->buildData($feedType, $_GET);
464 462
465 // Process plugin hook. 463 // Process plugin hook.
466 $pluginManager->executeHooks('render_feed', $data, array( 464 $pluginManager->executeHooks('render_feed', $data, array(