Changeset 6160 for branches/0.9/bb-includes/gettext.php

Timestamp:

12/12/2016 01:59:44 PM (8 years ago)

Author:

xknown

Message:

Branch 0.9: Fix PHP 7 compat issues w.r.t. the use of func_get_arg() and PHP 5.x constructors.

• func_get_arg() returns the current (modified) value of the given argument. Let's make sure the code behaves the same.
• Add PHP 5.x style constructors.
• Use preg_match instead of eregi

See #3033

File:

• branches/0.9/bb-includes/gettext.php (modified) (3 diffs)

branches/0.9/bb-includes/gettext.php

@@ -102 +102 @@
      * @param boolean enable_cache Enable or disable caching of strings (default on)
      */
-    function gettext_reader($Reader, $enable_cache = true) {
+    function __construct($Reader, $enable_cache = true) {
         // If there isn't a StreamReader, turn on short circuit mode.
         if (! $Reader || isset($Reader->error) ) {
@@ -136 +136 @@
         $this->originals = $this->readint();
         $this->translations = $this->readint();
+    }
+
+    function gettext_reader($Reader, $enable_cache = true) {
+        $this->__construct($Reader, $enable_cache);
     }
 
@@ -292 +296 @@
             }
             $header .= "\n"; //make sure our regex matches
-            if (eregi("plural-forms: ([^\n]*)\n", $header, $regs))
+            if (preg_match("/plural-forms: ([^\n]*)\n/i", $header, $regs))
                 $expr = $regs[1];
             else