ne pas lire inc_meta avec inc_connect

ecrire/inc_majbase.php3

@@ -5,10 +5,9 @@
 if (defined("_ECRIRE_INC_MAJBASE")) return;
 define("_ECRIRE_INC_MAJBASE", "1");
 
-include_ecrire('inc_meta.php3');
-
 function maj_version ($version, $test = true) {
 	if ($test) {
+		include_ecrire('inc_meta.php3');
 		ecrire_meta('version_installee', $version);
 		ecrire_metas();
 		spip_log("mise a jour de la base vers $version");
@@ -36,6 +35,7 @@ function maj_base() {
 	//
 	// $version_installee = 1.702; quand on a besoin de forcer une MAJ
 	if (!$version_installee) {
+		include_ecrire('inc_meta.php3');
 		ecrire_meta('version_installee', $spip_version);
 		ecrire_metas();
 		return true;

ecrire/upgrade.php3

 <?php
 
 include ("inc_version.php3");
+
+if (!_FILE_CONNECT) {
+	Header("Location: install.php3");
+	exit;
+ }
+
 include_ecrire ("inc_presentation.php3");
 include_ecrire ("inc_auth.php3");
 include_ecrire ("inc_admin.php3");
 include_ecrire ("inc_acces.php3");
-include_ecrire ("inc_meta.php3");
 include_ecrire ("inc_config.php3");
 include_ecrire ("inc_texte.php3");
 include_ecrire ("inc_filtres.php3");
 
-
 $spip_lang = lire_meta($langue_site);
 if (!$spip_lang) $spip_lang = "fr";
 
 // Si reinstallation necessaire, message ad hoc
 if ($reinstall == 'oui') {
-	if (!FILE_CONNECT) {
-		Header("Location: install.php3");
-		exit;
-	}
 
 	@copy(_FILE_CONNECT, _FILE_CONNECT_INS);