This IniConfig patch is also required.
Index: IniConfig.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/IniConfig.php,v
retrieving revision 1.40
diff -u -b -r1.40 IniConfig.php
--- IniConfig.php 22 Jun 2004 07:12:48 -0000 1.40
+++ IniConfig.php 24 Jun 2004 12:18:36 -0000
@@ -221,17 +234,20 @@
// User authentication
if (!isset($GLOBALS['USER_AUTH_ORDER']))
if (isset($rs['USER_AUTH_ORDER']))
- $GLOBALS['USER_AUTH_ORDER'] = preg_split('/\s*:\s*/',
$rs['USER_AUTH_ORDER']);
+ $GLOBALS['USER_AUTH_ORDER'] = preg_split('/\s*:\s*/',
+
$rs['USER_AUTH_ORDER']);
else
$GLOBALS['USER_AUTH_ORDER'] = array("PersonalPage");
// LDAP bind options
global $LDAP_SET_OPTION;
- if (isset($rs['LDAP_SET_OPTION'])) {
- $optlist = preg_split('/\s*:\s*/', @$rs['LDAP_SET_OPTION']);
+ if (LDAP_SET_OPTION) {
+ $optlist = preg_split('/\s*:\s*/', LDAP_SET_OPTION);
foreach ($optlist as $opt) {
$bits = preg_split('/\s*=\s*/', $opt, 2);
if (count($bits) == 2) {
+ if (is_string($bits[0]) and defined($bits[0]))
+ $bits[0] = constant($bits[0]);
$LDAP_SET_OPTION[$bits[0]] = $bits[1];
}
else {
|