From ae4a31b631e9cc764e3279eded7df17ef0787b1e Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Mon, 15 Nov 2004 14:37:32 +0000
Subject: [PATCH] =?UTF-8?q?la=20cr=C3=A9ation=20de=20table=20doit=20appele?=
=?UTF-8?q?r=20directement=20spip=5Fquery=5Fdb?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ecrire/inc_base.php3 | 8 ++++----
ecrire/inc_cron.php3 | 2 +-
ecrire/inc_version.php3 | 2 +-
ecrire/install.php3 | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ecrire/inc_base.php3 b/ecrire/inc_base.php3
index 3a86572dfd..7d65e6d730 100644
--- a/ecrire/inc_base.php3
+++ b/ecrire/inc_base.php3
@@ -38,7 +38,7 @@ function spip_create_table($nom, $champs, $cles, $autoinc=false) {
$query = "CREATE TABLE IF NOT EXISTS $nom ($query" .
($keys ? ",$keys" : '') .
")\n";
- spip_query($query);
+ spip_query_db($query);
}
@@ -62,14 +62,14 @@ function creer_base() {
"(1, 'jpg', 'JPEG', 'image'), ".
"(2, 'png', 'PNG', 'image'), ".
"(3, 'gif', 'GIF', 'image')";
- spip_query($query);
+ spip_query_db($query);
// Autres images (peuvent utiliser le tag <img>)
$query = "INSERT IGNORE spip_types_documents (extension, titre, inclus) VALUES ".
"('bmp', 'BMP', 'image'), ".
"('psd', 'Photoshop', 'image'), ".
"('tif', 'TIFF', 'image')";
- spip_query($query);
+ spip_query_db($query);
// Multimedia (peuvent utiliser le tag <embed>)
$query = "INSERT IGNORE spip_types_documents (extension, titre, inclus) VALUES ".
@@ -89,7 +89,7 @@ function creer_base() {
"('swf', 'Flash', 'embed'), ".
"('wav', 'WAV', 'embed'), ".
"('wmv', 'Windows Media', 'embed')";
- spip_query($query);
+ spip_query_db($query);
// Documents varies
$query = "INSERT IGNORE spip_types_documents (extension, titre, inclus) VALUES ".
diff --git a/ecrire/inc_cron.php3 b/ecrire/inc_cron.php3
index 3afa3bd3e1..fb46b8af5d 100644
--- a/ecrire/inc_cron.php3
+++ b/ecrire/inc_cron.php3
@@ -147,7 +147,7 @@ function spip_cron() {
cron_archiver_stats($last_date);
if ($t - lire_meta('date_stats_popularite') > 1800) {
- if (timeout('archiver_stats')) {
+ if (timeout('calculer_popularite')) {
include_ecrire("inc_statistiques.php3");
calculer_popularites();
}
diff --git a/ecrire/inc_version.php3 b/ecrire/inc_version.php3
index eb4da3427a..59299da38e 100644
--- a/ecrire/inc_version.php3
+++ b/ecrire/inc_version.php3
@@ -582,7 +582,7 @@ if (!$PATH_TRANSLATED) {
}
function spip_query($query) {
- if (!_FILE_CONNECT) {$GLOBALS['db_ok'] = false; return;}
+ if (_FILE_CONNECT) {$GLOBALS['db_ok'] = false; return;}
include_local(_FILE_CONNECT);
if (!$GLOBALS['db_ok']) return;
if ($GLOBALS['spip_connect_version'] < 0.1) {
diff --git a/ecrire/install.php3 b/ecrire/install.php3
index efe9bff19d..4d3053c1bf 100644
--- a/ecrire/install.php3
+++ b/ecrire/install.php3
@@ -156,7 +156,7 @@ else if ($etape == 4) {
mysql_select_db("$sel_db");
// Test si SPIP deja installe
- @spip_query_db("SELECT COUNT(*) FROM spip_meta");
+ spip_query_db("SELECT COUNT(*) FROM spip_meta");
$deja_installe = !spip_sql_errno();
creer_base();
--
GitLab