X-Git-Url: http://git.cyclocoop.org/?p=ptitvelo%2Fweb%2Fwww.git;a=blobdiff_plain;f=www%2Fecrire%2Finstall%2Fetape_3.php;h=5c706ff7cc74018c9440f7094a60ae935bcc63dd;hp=d7037167656d39e8776121de337d639f1620c4fb;hb=e847eea4a82a7396dd0abf860f9b30d654f38629;hpb=d686c3e22e97dd46ef42bcd0f138c65083f8f232

diff --git a/www/ecrire/install/etape_3.php b/www/ecrire/install/etape_3.php
index d703716..5c706ff 100644
--- a/www/ecrire/install/etape_3.php
+++ b/www/ecrire/install/etape_3.php
@@ -281,8 +281,8 @@ function install_etape_3_dist()
 	
 	} else { 
 		$res = '';
-		list($adresse_db, $login_db, $pass_db, $sel_db, $server_db)
-		= analyse_fichier_connection(_FILE_CONNECT_TMP);
+		list($adresse_db, $login_db, $pass_db, $sel_db, $server_db) = analyse_fichier_connection(_FILE_CONNECT_TMP);
+		$GLOBALS['connexions'][$server_db] = spip_connect_db($adresse_db, $sel_db, $login_db, $pass_db, $sel_db, $server_db);
 	}
 
 	if (!$res) {
@@ -300,7 +300,7 @@ function install_etape_3_dist()
 		  . (defined('_INSTALL_NAME_DB') ? ''
 		     : "\n<input type='hidden' name='sel_db' value='$sel_db' />");
 
-		$auteur_obligatoire = !sql_countsel('spip_auteurs','','','',$server_db);
+		$auteur_obligatoire = ($ldap_present?0:!sql_countsel('spip_auteurs','','','',$server_db));
 
 		$res =  "<div class='success'><b>"
 		. _T('info_base_installee')