diff options
| author | Leonardo Arena <rnalrd@alpinelinux.org> | 2014-09-15 09:07:55 +0000 |
|---|---|---|
| committer | Leonardo Arena <rnalrd@alpinelinux.org> | 2014-09-15 09:08:05 +0000 |
| commit | b7c7f3a32c989f109b8015cdecf58c3061e0b260 (patch) | |
| tree | 03615b7c4c7904e489515b23bdc4e57382a49b41 /main/phpldapadmin/phpldapadmin-1.2.3_changed-preg_replace-to-preg_replace-callback.patch | |
| parent | 66661c529f386b22705676ce1ef54ed3049fffe4 (diff) | |
| download | aports-b7c7f3a32c989f109b8015cdecf58c3061e0b260.tar.bz2 aports-b7c7f3a32c989f109b8015cdecf58c3061e0b260.tar.xz | |
main/phpldapadmin: fixes for php-5.5.16
Diffstat (limited to 'main/phpldapadmin/phpldapadmin-1.2.3_changed-preg_replace-to-preg_replace-callback.patch')
| -rw-r--r-- | main/phpldapadmin/phpldapadmin-1.2.3_changed-preg_replace-to-preg_replace-callback.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/main/phpldapadmin/phpldapadmin-1.2.3_changed-preg_replace-to-preg_replace-callback.patch b/main/phpldapadmin/phpldapadmin-1.2.3_changed-preg_replace-to-preg_replace-callback.patch new file mode 100644 index 0000000000..d2fa12a477 --- /dev/null +++ b/main/phpldapadmin/phpldapadmin-1.2.3_changed-preg_replace-to-preg_replace-callback.patch @@ -0,0 +1,38 @@ +From b082cf1742b2310d69b2f278f33f6025e2544acb Mon Sep 17 00:00:00 2001 +From: Mohamad Elrashidin Bin Sajeli <archayl@gmail.com> +Date: Thu, 8 May 2014 20:40:57 +0800 +Subject: [PATCH] Changed preg_replace to preg_replace callback + +--- + lib/functions.php | 14 ++++++++++++-- + 1 file changed, 12 insertions(+), 2 deletions(-) + +diff --git a/lib/functions.php b/lib/functions.php +index ad9ee9f..d31e0c1 100644 +--- a/lib/functions.php ++++ b/lib/functions.php +@@ -2565,12 +2565,22 @@ function dn_unescape($dn) { + $a = array(); + + foreach ($dn as $key => $rdn) +- $a[$key] = preg_replace('/\\\([0-9A-Fa-f]{2})/e',"''.chr(hexdec('\\1')).''",$rdn); ++ $a[$key] = preg_replace_callback('/\\\([0-9A-Fa-f]{2})/', ++ function ($r) { ++ return "''.chr(hexdec('$r[1]')).''"; ++ }, ++ $rdn ++ ); + + return $a; + + } else { +- return preg_replace('/\\\([0-9A-Fa-f]{2})/e',"''.chr(hexdec('\\1')).''",$dn); ++ return preg_replace_callback('/\\\([0-9A-Fa-f]{2})/', ++ function ($r) { ++ return "''.chr(hexdec('$r[1]')).''"; ++ }, ++ $dn ++ ); + } + } + |