[phpwiki-checkins] CVS: phpwiki/lib WikiGroup.php,1.34,1.35

[Reini U. <ru...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4018

Modified Files:
	WikiGroup.php 
Log Message:
better desc

Index: WikiGroup.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiGroup.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -2 -b -p -d -r1.34 -r1.35
--- WikiGroup.php	16 Jun 2004 11:51:35 -0000	1.34
+++ WikiGroup.php	16 Jun 2004 12:08:25 -0000	1.35
@@ -906,6 +906,9 @@ class GroupLdap extends WikiGroup {
             return false;
         }
-        if (! function_exists('ldap_connect') and !isWindows()) {
-            dl("ldap".DLL_EXT);
+        // We should ignore multithreaded environments, not generally windows.
+        // CGI does work.
+        if (! function_exists('ldap_connect') and (!isWindows() or isCGI())) {
+            // on MacOSX >= 4.3 you'll need PHP_SHLIB_SUFFIX instead.
+            dl("ldap".defined('PHP_SHLIB_SUFFIX') ? PHP_SHLIB_SUFFIX : DLL_EXT); 
             if (! function_exists('ldap_connect')) {
                 trigger_error(_("No LDAP in this PHP version"), E_USER_WARNING);
@@ -1029,4 +1032,7 @@ class GroupLdap extends WikiGroup {
 
 // $Log$
+// Revision 1.35  2004/06/16 12:08:25  rurban
+// better desc
+//
 // Revision 1.34  2004/06/16 11:51:35  rurban
 // catch dl error on Windows