From 967f0619c781a01a67f1d3c69946f63d5a4c1e54 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 22 Jan 2017 10:18:43 +0300 Subject: [PATCH] force ngettext() count argument type to string --- classes/feeds.php | 2 +- classes/pref/feeds.php | 6 +++--- classes/pref/filters.php | 4 ++-- include/feedbrowser.php | 2 +- include/functions2.php | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/classes/feeds.php b/classes/feeds.php index 8f101e5c..e0756b66 100755 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -741,7 +741,7 @@ class Feeds extends Handler_Protected { (+)"; - $num_comments = $line["num_comments"]; + $num_comments = (int) $line["num_comments"]; $entry_comments = ""; if ($num_comments > 0) { diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php index faef0900..bac859d7 100755 --- a/classes/pref/feeds.php +++ b/classes/pref/feeds.php @@ -62,7 +62,7 @@ class Pref_Feeds extends Handler_Protected { $cat['items'] = $this->get_category_items($line['id']); $num_children = $this->calculate_children_count($cat); - $cat['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', $num_children), $num_children); + $cat['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', (int) $num_children), $num_children); if ($num_children > 0 || $show_empty_cats) array_push($items, $cat); @@ -211,7 +211,7 @@ class Pref_Feeds extends Handler_Protected { $cat['items'] = $this->get_category_items($line['id']); $num_children = $this->calculate_children_count($cat); - $cat['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', $num_children), $num_children); + $cat['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', (int) $num_children), $num_children); if ($num_children > 0 || $show_empty_cats) array_push($root['items'], $cat); @@ -261,7 +261,7 @@ class Pref_Feeds extends Handler_Protected { array_push($root['items'], $cat); $num_children = $this->calculate_children_count($root); - $root['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', $num_children), $num_children); + $root['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', (int) $num_children), $num_children); } else { $feed_result = $this->dbh->query("SELECT id, title, last_error, diff --git a/classes/pref/filters.php b/classes/pref/filters.php index 95f82765..b7c286ec 100755 --- a/classes/pref/filters.php +++ b/classes/pref/filters.php @@ -1096,7 +1096,7 @@ class Pref_Filters extends Handler_Protected { if (!$title) $title = __("[No caption]"); - $title = sprintf(_ngettext("%s (%d rule)", "%s (%d rules)", $num_rules), $title, $num_rules); + $title = sprintf(_ngettext("%s (%d rule)", "%s (%d rules)", (int) $num_rules), $title, $num_rules); $result = $this->dbh->query( @@ -1114,7 +1114,7 @@ class Pref_Filters extends Handler_Protected { if ($match_any_rule) $title .= " (" . __("matches any rule") . ")"; if ($num_actions > 0) - $actions = sprintf(_ngettext("%s (+%d action)", "%s (+%d actions)", $num_actions), $actions, $num_actions); + $actions = sprintf(_ngettext("%s (+%d action)", "%s (+%d actions)", (int) $num_actions), $actions, $num_actions); return array($title, $actions); } diff --git a/include/feedbrowser.php b/include/feedbrowser.php index 800bcd97..4772420a 100644 --- a/include/feedbrowser.php +++ b/include/feedbrowser.php @@ -81,7 +81,7 @@ $class = ($feedctr % 2) ? "even" : "odd"; if ($line['articles_archived'] > 0) { - $archived = sprintf(_ngettext("%d archived article", "%d archived articles", $line['articles_archived']), $line['articles_archived']); + $archived = sprintf(_ngettext("%d archived article", "%d archived articles", (int) $line['articles_archived']), $line['articles_archived']); $archived = " ($archived)"; } else { $archived = ''; diff --git a/include/functions2.php b/include/functions2.php index 4535e626..28477a0c 100644 --- a/include/functions2.php +++ b/include/functions2.php @@ -1316,7 +1316,7 @@ $line = $p->hook_render_article($line); } - $num_comments = $line["num_comments"]; + $num_comments = (int) $line["num_comments"]; $entry_comments = ""; if ($num_comments > 0) { -- 2.39.5