- gettext: merge patch from Sunil Mohan Adapa which rewrites plural parser to not use eval()

- fix typo in aforementioned patch which caused plurals to never load
- update code again to newer PHP constructor syntax

1 files changed, 4 insertions, 4 deletions

diff --git a/lib/gettext/gettext.inc.php b/lib/gettext/gettext.inc.php
index c9f7dc016..ed5be6bbd 100644
--- a/lib/gettext/gettext.inc.php
+++ b/lib/gettext/gettext.inc.php
@@ -69,10 +69,10 @@ function get_list_of_locales($locale) {
    * sr_CS.UTF-8@latin, sr_CS@latin, sr@latin, sr_CS.UTF-8, sr_CS, sr.
    */
   $locale_names = array();
-  $lang = NULL;
-  $country = NULL;
-  $charset = NULL;
-  $modifier = NULL;
+  $lang = null;
+  $country = null;
+  $charset = null;
+  $modifier = null;
   if ($locale) {
     if (preg_match("/^(?P<lang>[a-z]{2,3})"              // language code
                    ."(?:_(?P<country>[A-Z]{2}))?"           // country code