From: Anders Kaseorg <andersk@mit.edu>
Date: Fri, 20 Jan 2017 19:49:24 +0000 (-0500)
Subject: lib: Upgrade php-gettext from 1.0.11 to 1.0.12
X-Git-Tag: 17.1~6^2~7
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=526096f06a7916fca71af48814c90d33c8e02641;p=tt-rss.git

lib: Upgrade php-gettext from 1.0.11 to 1.0.12

https://launchpad.net/php-gettext

The local change to rename the gettext_reader function to
__construct (commit 00b6b66827c5ce0c103399f2742581fa90d50a97) has been
preserved.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
---

diff --git a/lib/gettext/gettext.inc b/lib/gettext/gettext.inc
index 00b96669..c9f7dc01 100644
--- a/lib/gettext/gettext.inc
+++ b/lib/gettext/gettext.inc
@@ -174,14 +174,13 @@ function _get_codeset($domain=null) {
  * Convert the given string to the encoding set by bind_textdomain_codeset.
  */
 function _encode($text) {
+  $target_encoding = _get_codeset();
+  if (function_exists("mb_detect_encoding")) {
     $source_encoding = mb_detect_encoding($text);
-    $target_encoding = _get_codeset();
-    if ($source_encoding != $target_encoding) {
-        return mb_convert_encoding($text, $target_encoding, $source_encoding);
-    }
-    else {
-        return $text;
-    }
+    if ($source_encoding != $target_encoding)
+      $text = mb_convert_encoding($text, $target_encoding, $source_encoding);
+  }
+  return $text;
 }
 
 
diff --git a/lib/gettext/gettext.php b/lib/gettext/gettext.php
index 81af5550..edbd9330 100755
--- a/lib/gettext/gettext.php
+++ b/lib/gettext/gettext.php
@@ -350,6 +350,10 @@ class gettext_reader {
    * @return int array index of the right plural form
    */
   function select_string($n) {
+    if (!is_int($n)) {
+      throw new InvalidArgumentException(
+        "Select_string only accepts integers: " . $n);
+    }
     $string = $this->get_plural_forms();
     $string = str_replace('nplurals',"\$total",$string);
     $string = str_replace("n",$n,$string);