From e92af9d2bdf6adbbcfd8b1fa84b72b93e641ece8 Mon Sep 17 00:00:00 2001
From: Fil <fil@rezo.net>
Date: Mon, 7 Oct 2002 12:42:56 +0000
Subject: [PATCH] Une piste pour permettre l'installation.
---
ecrire/inc_version.php3 | 4 +---
ecrire/install.php3 | 2 +-
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/ecrire/inc_version.php3 b/ecrire/inc_version.php3
index e57e8b92d8..421f7d86e7 100644
--- a/ecrire/inc_version.php3
+++ b/ecrire/inc_version.php3
@@ -34,9 +34,7 @@ $table_prefix = "spip";
function spip_query($query) {
include_ecrire("inc_mysql.php3");
- if (!defined("_ECRIRE_INC_CONNECT")) { // eviter de boucler
- include_ecrire("inc_connect.php3");
- }
+ include_ecrire("inc_connect.php3");
if (!$GLOBALS['db_ok'])
return;
return query($query);
diff --git a/ecrire/install.php3 b/ecrire/install.php3
index 838ae99bc2..29fa57c462 100644
--- a/ecrire/install.php3
+++ b/ecrire/install.php3
@@ -162,7 +162,7 @@ else if ($etape == 4) {
$conn .= "\$GLOBALS['db_ok'] = true;\n";
$conn .= "@mysql_connect('$adresse_db','$login_db','$pass_db');\n";
$conn .= "@mysql_select_db('$sel_db');\n";
- $conn .= "\$GLOBALS['db_ok'] &= !!@spip_num_rows(@spip_query('SELECT COUNT(*) FROM spip_meta'));\n";
+ $conn .= "\$GLOBALS['db_ok'] &= !!@spip_num_rows(@query('SELECT COUNT(*) FROM spip_meta'));\n";
$conn .= "?".">";
$myFile = fopen("inc_connect_install.php3", "wb");
fputs($myFile, $conn);
--
GitLab