diff options
| author | Matthew Seaman <matthew@FreeBSD.org> | 2014-04-27 09:51:17 +0000 |
|---|---|---|
| committer | Matthew Seaman <matthew@FreeBSD.org> | 2014-04-27 09:51:17 +0000 |
| commit | f660a251cd43816c37002d927455eb6a7a346aa4 (patch) | |
| tree | 070ecd635c598ba1661ad4518afab2e246bdbbfe /net/phpldapadmin/files/patch-lib__PageRender.php | |
| parent | Update 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__PageRender.php')
| -rw-r--r-- | net/phpldapadmin/files/patch-lib__PageRender.php | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/net/phpldapadmin/files/patch-lib__PageRender.php b/net/phpldapadmin/files/patch-lib__PageRender.php new file mode 100644 index 000000000000..3b171649855e --- /dev/null +++ b/net/phpldapadmin/files/patch-lib__PageRender.php @@ -0,0 +1,29 @@ +--- ./lib/PageRender.php.orig 2012-10-01 07:54:14.000000000 +0100 ++++ ./lib/PageRender.php 2014-04-27 09:42:04.069744333 +0100 +@@ -287,7 +287,7 @@ + break; + + default: +- $vals[$i] = password_hash($passwordvalue,$enc); ++ $vals[$i] = password_hash_custom($passwordvalue,$enc); + } + + $vals = array_unique($vals); +@@ -957,7 +957,7 @@ + if (trim($val)) + $enc_type = get_enc_type($val); + else +- $enc_type = $server->getValue('appearance','password_hash'); ++ $enc_type = $server->getValue('appearance','password_hash_custom'); + + $obfuscate_password = obfuscate_password_display($enc_type); + +@@ -982,7 +982,7 @@ + if (trim($val)) + $enc_type = get_enc_type($val); + else +- $enc_type = $server->getValue('appearance','password_hash'); ++ $enc_type = $server->getValue('appearance','password_hash_custom'); + + echo '<table cellspacing="0" cellpadding="0"><tr><td valign="top">'; + |