From 16a43cf275a6840dec7e95d5b4ce6d26b40784d4 Mon Sep 17 00:00:00 2001
From: Antoine Pitrou <pitrou@free.fr>
Date: Sun, 14 Apr 2002 13:37:33 +0000
Subject: [PATCH] Suppression flag inclus dans spip_documents : inutile,
contre-intuitif, et techniquement laid.
---
ecrire/inc_base.php3 | 4 ++--
ecrire/inc_texte.php3 | 6 +-----
ecrire/inc_version.php3 | 2 +-
3 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/ecrire/inc_base.php3 b/ecrire/inc_base.php3
index 81f7bf2ec0..32cb5386c0 100644
--- a/ecrire/inc_base.php3
+++ b/ecrire/inc_base.php3
@@ -764,8 +764,8 @@ function maj_base() {
$result = mysql_query($query);
}
- if ($version_installee < 1.415) {
- mysql_query("ALTER TABLE spip_documents ADD inclus VARCHAR(3) DEFAULT 'non'");
+ if ($version_installee == 1.415) {
+ mysql_query("ALTER TABLE spip_documents DROP inclus");
}
//
diff --git a/ecrire/inc_texte.php3 b/ecrire/inc_texte.php3
index 4abeeab90b..a9f26a64dd 100644
--- a/ecrire/inc_texte.php3
+++ b/ecrire/inc_texte.php3
@@ -253,11 +253,6 @@ function integre_image($id_document, $align, $type_aff = 'IMG') {
$mode = $row['mode'];
$id_vignette = $row['id_vignette'];
- // Gerer les inclusions des documents
- mysql_query("UPDATE spip_documents SET inclus = 'oui' WHERE id_document=$id_document");
- if ($id_vignette > 0)
- mysql_query("UPDATE spip_documents SET inclus = 'oui' WHERE id_document=$id_vignette");
-
// type d'affichage : IMG, DOC
$affichage_detaille = (strtoupper($type_aff) == 'DOC');
@@ -340,6 +335,7 @@ function integre_image($id_document, $align, $type_aff = 'IMG') {
return $retour;
}
+
// Correction typographique francaise
function typo_fr($letexte) {
global $flag_preg_replace;
diff --git a/ecrire/inc_version.php3 b/ecrire/inc_version.php3
index 7b4b84de91..29d0339a40 100644
--- a/ecrire/inc_version.php3
+++ b/ecrire/inc_version.php3
@@ -12,7 +12,7 @@ define("_ECRIRE_INC_VERSION", "1");
// (utilise pour les modifs de la base de donnees)
//
-$spip_version = 1.415; // version de la base
+$spip_version = 1.416; // version de la base
// dernier tag connu ou date si cvs
if (! ereg('Name: v(.*) ','$Name$', $regs))
--
GitLab