From 3588d5186ef7321fa573adbb62f42b05d7a138be Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Fri, 18 Sep 2020 14:05:34 +0300
Subject: - 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

---
 lib/gettext/gettext.inc.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'lib/gettext/gettext.inc.php')

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
-- 
cgit v1.2.3-54-g00ecf