diff options
| author | fox <[email protected]> | 2021-11-19 07:36:15 +0300 |
|---|---|---|
| committer | fox <[email protected]> | 2021-11-19 07:36:15 +0300 |
| commit | 0a3a464defbe67092a0bd155cb2f6afcf379da2e (patch) | |
| tree | df4d699e5d11d5a6f19f26472a1702cbcbad7f4e /classes/pref/feeds.php | |
| parent | 3070933f649c097ca8ed02a8aea61eede1408b45 (diff) | |
| parent | 4a891b20f06e04b015d4da9b755d444b915f4b7d (diff) | |
Merge pull request 'Consistently handle param string to bool conversions in handlers.' (#53) from wn/tt-rss:feature/consistent-param-to-bool into master
Reviewed-on: https://git.tt-rss.org/fox/tt-rss/pulls/53
Diffstat (limited to 'classes/pref/feeds.php')
| -rwxr-xr-x | classes/pref/feeds.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php index 47479e124..d2a30662b 100755 --- a/classes/pref/feeds.php +++ b/classes/pref/feeds.php @@ -47,7 +47,7 @@ class Pref_Feeds extends Handler_Protected { $search = ""; // first one is set by API - $show_empty_cats = clean($_REQUEST['force_show_empty'] ?? false) || + $show_empty_cats = self::_param_to_bool($_REQUEST['force_show_empty'] ?? false) || (clean($_REQUEST['mode'] ?? 0) != 2 && !$search); $items = []; @@ -208,7 +208,7 @@ class Pref_Feeds extends Handler_Protected { } if ($enable_cats) { - $show_empty_cats = clean($_REQUEST['force_show_empty'] ?? false) || + $show_empty_cats = self::_param_to_bool($_REQUEST['force_show_empty'] ?? false) || (clean($_REQUEST['mode'] ?? 0) != 2 && !$search); $feed_categories = ORM::for_table('ttrss_feed_categories') @@ -1260,7 +1260,7 @@ class Pref_Feeds extends Handler_Protected { function regenFeedKey(): void { $feed_id = clean($_REQUEST['id']); - $is_cat = clean($_REQUEST['is_cat']); + $is_cat = self::_param_to_bool($_REQUEST['is_cat'] ?? false); $new_key = Feeds::_update_access_key($feed_id, $is_cat, $_SESSION["uid"]); @@ -1269,7 +1269,7 @@ class Pref_Feeds extends Handler_Protected { function getSharedURL(): void { $feed_id = clean($_REQUEST['id']); - $is_cat = clean($_REQUEST['is_cat']) == "true"; + $is_cat = self::_param_to_bool($_REQUEST['is_cat'] ?? false); $search = clean($_REQUEST['search']); $link = Config::get_self_url() . "/public.php?" . http_build_query([ |