summaryrefslogtreecommitdiff
path: root/net/phpldapadmin/files/patch-lib__ds_ldap_pla.php
diff options
context:
space:
mode:
authorMatthew Seaman <matthew@FreeBSD.org>2014-04-27 09:51:17 +0000
committerMatthew Seaman <matthew@FreeBSD.org>2014-04-27 09:51:17 +0000
commitf660a251cd43816c37002d927455eb6a7a346aa4 (patch)
tree070ecd635c598ba1661ad4518afab2e246bdbbfe /net/phpldapadmin/files/patch-lib__ds_ldap_pla.php
parentUpdate emulators/i386-wine-devel to 1.7.17. (diff)
Add patches from the PLA git repository http://sourceforge.net/u/nihilisticz/phpldapadmin/commit_browser
These solve a function name clash with a new php-5.5 built-in and use of the deprecated preg_replace /e modifier. Submitted by: Zhang Huangbin Obtained from: http://sourceforge.net/u/nihilisticz/phpldapadmin/commit_browser
Diffstat (limited to 'net/phpldapadmin/files/patch-lib__ds_ldap_pla.php')
-rw-r--r--net/phpldapadmin/files/patch-lib__ds_ldap_pla.php11
1 files changed, 11 insertions, 0 deletions
diff --git a/net/phpldapadmin/files/patch-lib__ds_ldap_pla.php b/net/phpldapadmin/files/patch-lib__ds_ldap_pla.php
new file mode 100644
index 000000000000..707ede969058
--- /dev/null
+++ b/net/phpldapadmin/files/patch-lib__ds_ldap_pla.php
@@ -0,0 +1,11 @@
+--- ./lib/ds_ldap_pla.php.orig 2012-10-01 07:54:14.000000000 +0100
++++ ./lib/ds_ldap_pla.php 2014-04-27 09:42:04.099743918 +0100
+@@ -16,7 +16,7 @@
+ function __construct($index) {
+ parent::__construct($index);
+
+- $this->default->appearance['password_hash'] = array(
++ $this->default->appearance['password_hash_custom'] = array(
+ 'desc'=>'Default HASH to use for passwords',
+ 'default'=>'md5');
+