diff options
| author | TBK <tbk@jjtc.eu> | 2019-05-31 15:58:42 +0200 |
|---|---|---|
| committer | Kevin Daudt <kdaudt@alpinelinux.org> | 2019-06-02 21:11:00 +0000 |
| commit | f711231ca669f59173800dc3cad4f84fabe7d50c (patch) | |
| tree | 96a86fc1200b079907adde313be136ff810cdee0 /community/phpldapadmin/phpldapadmin-1.2.3_use-preg_replace_callback.patch | |
| parent | 9f41f37ae319d064e9496729d9edfe73c6db2814 (diff) | |
| download | aports-f711231ca669f59173800dc3cad4f84fabe7d50c.tar.bz2 aports-f711231ca669f59173800dc3cad4f84fabe7d50c.tar.xz | |
community/phpldapadmin: upgrade to 1.2.4
Closes GH-8326
Diffstat (limited to 'community/phpldapadmin/phpldapadmin-1.2.3_use-preg_replace_callback.patch')
| -rw-r--r-- | community/phpldapadmin/phpldapadmin-1.2.3_use-preg_replace_callback.patch | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/community/phpldapadmin/phpldapadmin-1.2.3_use-preg_replace_callback.patch b/community/phpldapadmin/phpldapadmin-1.2.3_use-preg_replace_callback.patch deleted file mode 100644 index 60c086d197..0000000000 --- a/community/phpldapadmin/phpldapadmin-1.2.3_use-preg_replace_callback.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 5a7edc892f1b3cccab74ed150f9d6843912a39ee Mon Sep 17 00:00:00 2001 -From: Ben Chavet <ben@chavet.net> -Date: Thu, 29 May 2014 18:57:44 +0000 -Subject: [PATCH] Use preg_replace_callback instead of /e in preg_replace to - fix E_DEPRECATED warnings - ---- - lib/ds_ldap.php | 11 ++++++----- - 1 file changed, 6 insertions(+), 5 deletions(-) - -diff --git a/lib/ds_ldap.php b/lib/ds_ldap.php -index c346660..8bc1ef8 100644 ---- a/lib/ds_ldap.php -+++ b/lib/ds_ldap.php -@@ -1116,13 +1116,14 @@ private function unescapeDN($dn) { - - if (is_array($dn)) { - $a = array(); -- foreach ($dn as $key => $rdn) -- $a[$key] = preg_replace('/\\\([0-9A-Fa-f]{2})/e',"''.chr(hexdec('\\1')).''",$rdn); -- -+ foreach ($dn as $key => $rdn) { -+ $a[$key] = preg_replace_callback('/\\\([0-9A-Fa-f]{2})/', function($m) { return "''.chr(hexdec('${m[1]}')).''"; }, $rdn); -+ } - return $a; - -- } else -- return preg_replace('/\\\([0-9A-Fa-f]{2})/e',"''.chr(hexdec('\\1')).''",$dn); -+ } else { -+ return preg_replace_callback('/\\\([0-9A-Fa-f]{2})/', function($m) { return "''.chr(hexdec('${m[1]}')).''"; }, $dn); -+ } - } - - public function getRootDSE($method=null) { |