aboutsummaryrefslogtreecommitdiff
path: root/app/layout
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2024-03-05 14:26:52 +0100
committerGravatar GitHub <noreply@github.com> 2024-03-05 14:26:52 +0100
commit5aeab896e9042478e8de0c0989fe1be3b208d31f (patch)
tree68a5514a55e8ff7c581ee4c16905fd046e7851a7 /app/layout
parent9711f1477de7e2d8771501336adff3abef073e7b (diff)
Fix OPML export regression and add token in RSS link (#6160)
* OPML regression due to *shared user queries* (the XPath attributes were not exported anymore) https://github.com/FreshRSS/FreshRSS/pull/6052 * Add master token to HTML Meta RSS link and OPML link https://github.com/FreshRSS/FreshRSS/discussions/6159#discussioncomment-8678399
Diffstat (limited to 'app/layout')
-rw-r--r--app/layout/layout.phtml4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/layout/layout.phtml b/app/layout/layout.phtml
index 2183f9804..b6ed99724 100644
--- a/app/layout/layout.phtml
+++ b/app/layout/layout.phtml
@@ -40,6 +40,8 @@
if ($this->rss_title != '') {
$url_rss = $url_base;
$url_rss['a'] = 'rss';
+ $url_rss['params']['user'] = Minz_User::name();
+ $url_rss['params']['token'] = FreshRSS_Context::userConf()->token ?: null;
unset($url_rss['params']['rid']);
if (FreshRSS_Context::userConf()->since_hours_posts_per_rss) {
$url_rss['params']['hours'] = FreshRSS_Context::userConf()->since_hours_posts_per_rss;
@@ -49,6 +51,8 @@
<?php } if (FreshRSS_Context::isAll() || FreshRSS_Context::isCategory() || FreshRSS_Context::isFeed()) {
$opml_rss = $url_base;
$opml_rss['a'] = 'opml';
+ $opml_rss['params']['user'] = Minz_User::name();
+ $opml_rss['params']['token'] = FreshRSS_Context::userConf()->token ?: null;
unset($opml_rss['params']['rid']);
?>
<link rel="outline" type="text/x-opml" title="OPML" href="<?= Minz_Url::display($opml_rss) ?>" />