From d17a15c94c3d9863948abcc8fa80252f1d457179 Mon Sep 17 00:00:00 2001
From: James <james@rezo.net>
Date: Mon, 11 Dec 2006 17:14:09 +0000
Subject: [PATCH]
---
.gitattributes | 1 -
ecrire/exec/install.php | 2 +-
ecrire/install/etape_unpack.php | 38 ---------------------------------
3 files changed, 1 insertion(+), 40 deletions(-)
delete mode 100644 ecrire/install/etape_unpack.php
diff --git a/.gitattributes b/.gitattributes
index 826ef625dd..8dd540441f 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -522,7 +522,6 @@ ecrire/install/etape_ldap2.php -text
ecrire/install/etape_ldap3.php -text
ecrire/install/etape_ldap4.php -text
ecrire/install/etape_ldap5.php -text
-ecrire/install/etape_unpack.php -text
ecrire/lang/ecrire_br.php -text
ecrire/lang/ecrire_bs.php -text
ecrire/lang/ecrire_cs.php -text
diff --git a/ecrire/exec/install.php b/ecrire/exec/install.php
index e0ba88f788..5f1acf4250 100644
--- a/ecrire/exec/install.php
+++ b/ecrire/exec/install.php
@@ -19,7 +19,7 @@ define('_FILE_TMP', '_install');
function exec_install_dist()
{
$etape = _request('etape');
- if (_FILE_CONNECT && $etape != 'unpack')
+ if (_FILE_CONNECT)
minipres('AUTO', _T('avis_espace_interdit'));
else {
diff --git a/ecrire/install/etape_unpack.php b/ecrire/install/etape_unpack.php
deleted file mode 100644
index c1920c6f4f..0000000000
--- a/ecrire/install/etape_unpack.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-/***************************************************************************\
- * SPIP, Systeme de publication pour l'internet *
- * *
- * Copyright (c) 2001-2006 *
- * Arnaud Martin, Antoine Pitrou, Philippe Riviere, Emmanuel Saint-James *
- * *
- * Ce programme est un logiciel libre distribue sous licence GNU/GPL. *
- * Pour plus de details voir le fichier COPYING.txt ou l'aide en ligne. *
-\***************************************************************************/
-
-if (!defined("_ECRIRE_INC_VERSION")) return;
-include_spip('inc/actions');
-include_spip('inc/headers');
-// http://doc.spip.org/@inc_install_unpack
-function install_etape_unpack_dist()
-{
- global $connect_id_auteur;
-
- include_spip('inc/admin');
-
- $action = _T('texte_unpack');
-
- debut_admin("install",$action);
-
- fin_admin($action);
-
- ## ??????? a verifier
- if (@file_exists(_DIR_RACINE . "spip_loader" . '.php'))
- redirige_par_entete(generer_action_auteur('loader','','',true));
- else if (@file_exists(_DIR_RESTREINT . 'inc/install_unpack.php'))
- redirige_par_entete(generer_action_auteur('unpack','','',true));
- else // c'est qui lui ????
- redirige_par_entete(generer_action_auteur('loader','','',true));
-}
-
-?>
--
GitLab