From 4b82cf944d8b9ceb6446d8e3e468a78ad1e29aab Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Wed, 25 Apr 2007 21:48:34 +0000
Subject: [PATCH] "renumeroter les scripts d'install"
---
.gitattributes | 2 +-
ecrire/install/etape_1.php | 2 +-
ecrire/install/{etape_3.php => etape_2.php} | 5 ++---
3 files changed, 4 insertions(+), 5 deletions(-)
rename ecrire/install/{etape_3.php => etape_2.php} (97%)
diff --git a/.gitattributes b/.gitattributes
index f58ebbd1ea..0e71d0ebb5 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -594,7 +594,7 @@ ecrire/inc/virtualiser.php -text
ecrire/inc/xml.php -text
ecrire/install/etape_.php -text
ecrire/install/etape_1.php -text
-ecrire/install/etape_3.php -text
+ecrire/install/etape_2.php -text
ecrire/install/etape_5.php -text
ecrire/install/etape_6.php -text
ecrire/install/etape_ldap1.php -text
diff --git a/ecrire/install/etape_1.php b/ecrire/install/etape_1.php
index c1f1b58640..a1d820c747 100644
--- a/ecrire/install/etape_1.php
+++ b/ecrire/install/etape_1.php
@@ -46,7 +46,7 @@ function install_etape_1_dist()
}
}
echo generer_post_ecrire('install', (
- "\n<input type='hidden' name='etape' value='3' />"
+ "\n<input type='hidden' name='etape' value='2' />"
. "\n<input type='hidden' name='chmod' value='$chmod' />"
. (_request('echec')?
diff --git a/ecrire/install/etape_3.php b/ecrire/install/etape_2.php
similarity index 97%
rename from ecrire/install/etape_3.php
rename to ecrire/install/etape_2.php
index 7109ee579f..a7c67ed617 100644
--- a/ecrire/install/etape_3.php
+++ b/ecrire/install/etape_2.php
@@ -10,8 +10,7 @@
* Pour plus de details voir le fichier COPYING.txt ou l'aide en ligne. *
\***************************************************************************/
-// http://doc.spip.org/@inc_install_3
-function install_etape_3_dist()
+function install_etape_2_dist()
{
global $adresse_db, $login_db, $pass_db, $spip_lang_right, $chmod, $table_prefix;
if (is_null($table_prefix)) {
@@ -104,7 +103,7 @@ function install_etape_3_dist()
echo "<p style='font-size: small;'>"._T('avis_connexion_echec_3')."</p>";
}
- echo info_progression_etape(3,'etape_','install/');
+ echo info_progression_etape(2,'etape_','install/');
echo install_fin_html();
}
--
GitLab