diff --git a/ecrire/inc_version.php3 b/ecrire/inc_version.php3 index e57e8b92d874175e6225b03b2026b44a80a33c30..421f7d86e7375646abf95095d9925b2ca6d40c69 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 838ae99bc25c2ef6a10eeb7289fdd987a5a28e55..29fa57c462de32bb6806fb9cbb86a302fedaf44a 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);