summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2017-01-22 10:18:43 +0300
committerAndrew Dolgov <[email protected]>2017-01-22 10:18:43 +0300
commit967f0619c781a01a67f1d3c69946f63d5a4c1e54 (patch)
treef6a2ce79924dd924985b2f52b2666dc371d9a3ef /classes
parent0047f2578f126cb6de2eed928e86ed7340c3854d (diff)
force ngettext() count argument type to string
Diffstat (limited to 'classes')
-rwxr-xr-xclasses/feeds.php2
-rwxr-xr-xclasses/pref/feeds.php6
-rwxr-xr-xclasses/pref/filters.php4
3 files changed, 6 insertions, 6 deletions
diff --git a/classes/feeds.php b/classes/feeds.php
index 8f101e5cb..e0756b664 100755
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -741,7 +741,7 @@ class Feeds extends Handler_Protected {
<a title=\"".__('Edit tags for this article')."\"
href=\"#\" onclick=\"editArticleTags($id)\">(+)</a>";
- $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 faef0900f..bac859d75 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 95f82765f..b7c286ecf 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);
}