From bd3c38de849330b3ed28df05c1220c631c103628 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 15 Feb 2021 16:41:52 +0300 Subject: [PATCH] move bookmarklet-related subscribe_to_feed_url to bookmarklet plugin --- classes/pref/feeds.php | 6 ------ plugins/bookmarklets/init.php | 8 +++++++- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php index 4c865e9f0..cb6ff94fc 100755 --- a/classes/pref/feeds.php +++ b/classes/pref/feeds.php @@ -1655,10 +1655,4 @@ class Pref_Feeds extends Handler_Protected { return $c; } - static function subscribe_to_feed_url() { - $url_path = get_self_url_prefix() . - "/public.php?op=subscribe&feed_url=%s"; - return $url_path; - } - } diff --git a/plugins/bookmarklets/init.php b/plugins/bookmarklets/init.php index fa1bb8cf6..9e0f8f348 100644 --- a/plugins/bookmarklets/init.php +++ b/plugins/bookmarklets/init.php @@ -16,6 +16,12 @@ class Bookmarklets extends Plugin { $host->add_hook($host::HOOK_PREFS_TAB, $this); } + private function subscribe_to_feed_url() { + $url_path = get_self_url_prefix() . + "/public.php?op=subscribe&feed_url=%s"; + return $url_path; + } + function hook_prefs_tab($args) { if ($args == "prefFeeds") { @@ -24,7 +30,7 @@ class Bookmarklets extends Plugin { print "

" . __("Drag the link below to your browser toolbar, open the feed you're interested in in your browser and click on the link to subscribe to it.") . "

"; - $bm_subscribe_url = str_replace('%s', '', Pref_Feeds::subscribe_to_feed_url()); + $bm_subscribe_url = str_replace('%s', '', $this->subscribe_to_feed_url()); $confirm_str = str_replace("'", "\'", __('Subscribe to %s in Tiny Tiny RSS?'));