summaryrefslogtreecommitdiff
path: root/net/phpldapadmin/files/patch-lib_common.php
diff options
context:
space:
mode:
Diffstat (limited to 'net/phpldapadmin/files/patch-lib_common.php')
-rw-r--r--net/phpldapadmin/files/patch-lib_common.php23
1 files changed, 12 insertions, 11 deletions
diff --git a/net/phpldapadmin/files/patch-lib_common.php b/net/phpldapadmin/files/patch-lib_common.php
index 3fd26f51085a..9e464a0fd2a1 100644
--- a/net/phpldapadmin/files/patch-lib_common.php
+++ b/net/phpldapadmin/files/patch-lib_common.php
@@ -1,13 +1,14 @@
--- lib/common.php.orig 2021-12-12 02:35:51 UTC
+++ lib/common.php
-@@ -296,7 +296,9 @@ if ($app['language'] == 'auto') {
- * Strip slashes from GET, POST, and COOKIE variables if this
- * PHP install is configured to automatically addslashes()
- */
--if (@get_magic_quotes_gpc() && (! isset($slashes_stripped) || ! $slashes_stripped)) {
-+if (@version_compare(phpversion(), '5.4.0', '<') &&
-+ @get_magic_quotes_gpc() &&
-+ (!isset($slashes_stripped) || !$slashes_stripped)) {
- array_stripslashes($_REQUEST);
- array_stripslashes($_GET);
- array_stripslashes($_POST);
+@@ -247,9 +247,9 @@ if ($app['language'] == 'auto') {
+
+ $value = preg_split('/[-]+/',$value);
+ if (sizeof($value) == 2)
+- $app['lang_http'][$key] = strtolower($value[0]).'_'.strtoupper($value[1]);
++ $app['lang_http'][$key] = strtolower((string) $value[0]).'_'.strtoupper($value[1]);
+ else
+- $app['lang_http'][$key] = auto_lang(strtolower($value[0]));
++ $app['lang_http'][$key] = auto_lang(strtolower((string) $value[0]));
+ }
+
+ $app['lang_http'] = array_unique($app['lang_http']);