diff options
| author | Andrew Dolgov <[email protected]> | 2021-02-12 19:17:50 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2021-02-12 19:17:50 +0300 |
| commit | 157675d9fda01e399804aad73388fba57927c6df (patch) | |
| tree | a613999b2eea39c81344b7cd31136a5439c1054a | |
| parent | 7f0800537e8268dcbc4fce19f38fcbaa3d78a1cd (diff) | |
prefs: fix published shared URL dialog
| -rwxr-xr-x | classes/pref/feeds.php | 8 | ||||
| -rw-r--r-- | js/CommonDialogs.js | 10 |
2 files changed, 10 insertions, 8 deletions
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php index 1a5e3d206..47e5689ec 100755 --- a/classes/pref/feeds.php +++ b/classes/pref/feeds.php @@ -1391,10 +1391,10 @@ class Pref_Feeds extends Handler_Protected { $rss_url = htmlspecialchars(get_self_url_prefix() . "/public.php?op=rss&id=-2&view-mode=all_articles");; - print "<button dojoType='dijit.form.Button' class='alt-primary' onclick='CommonDialogs.generatedFeed(-2, false, \"$rss_url\")'>". - __('Display URL')."</button> "; - - print "<button class=\"alt-danger\" dojoType=\"dijit.form.Button\" onclick=\"return Helpers.clearFeedAccessKeys()\">". + print "<button dojoType='dijit.form.Button' class='alt-primary' + onclick='CommonDialogs.generatedFeed(-2, false, \"$rss_url\", \"".__("Published articles")."\")'>". + __('Display URL')."</button> + <button class='alt-danger' dojoType='dijit.form.Button' onclick='return Helpers.clearFeedAccessKeys()'>". __('Clear all generated URLs')."</button> "; PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB_SECTION, "prefFeedsPublishedGenerated"); diff --git a/js/CommonDialogs.js b/js/CommonDialogs.js index 038a2981d..18250bbb8 100644 --- a/js/CommonDialogs.js +++ b/js/CommonDialogs.js @@ -387,17 +387,19 @@ const CommonDialogs = { Notify.close(); } catch (e) { - this.Error.report(e); + App.Error.report(e); } }); }, - generatedFeed: function(feed, is_cat, rss_url) { + generatedFeed: function(feed, is_cat, rss_url, feed_title) { Notify.progress("Loading, please wait...", true); xhrJson("backend.php", {op: "pref-feeds", method: "getFeedKey", id: feed, is_cat: is_cat}, (reply) => { try { - const feed_title = Feeds.getName(feed, is_cat); + if (!feed_title && typeof Feeds != "undefined") + feed_title = Feeds.getName(feed, is_cat); + const secret_url = rss_url + "&key=" + encodeURIComponent(reply.link); const dialog = new fox.SingleUseDialog({ @@ -428,7 +430,7 @@ const CommonDialogs = { Notify.close(); } catch (e) { - this.Error.report(e); + App.Error.report(e); } }); }, |