From 154d500cd97dc46ed16c945e4c4c9fdc4819739e Mon Sep 17 00:00:00 2001
From: Matthieu Marcillaud <marcimat@rezo.net>
Date: Tue, 11 Nov 2008 15:28:46 +0000
Subject: [PATCH] Report de [13142]
---
ecrire/req/pg.php | 3 +--
ecrire/req/sqlite_generique.php | 5 ++---
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/ecrire/req/pg.php b/ecrire/req/pg.php
index dbfe96d6a5..a2a882c717 100644
--- a/ecrire/req/pg.php
+++ b/ecrire/req/pg.php
@@ -164,8 +164,7 @@ function spip_pg_alter($query, $serveur='',$requeter=true) {
$o=(false!==strpos($do,"("));
$f=(false!==strpos($do,")"));
if ($o AND !$f) $ouverte=true;
- elseif (!$o AND $f) $ouverte=false;
- elseif ($o AND $f) $ouverte=false;
+ elseif ($f) $ouverte=false;
if (!$ouverte) $i++;
}
$todo=$todo2;
diff --git a/ecrire/req/sqlite_generique.php b/ecrire/req/sqlite_generique.php
index 16881bfefa..e78d59859c 100644
--- a/ecrire/req/sqlite_generique.php
+++ b/ecrire/req/sqlite_generique.php
@@ -165,8 +165,7 @@ function spip_sqlite_alter($query, $serveur='',$requeter=true){
$o=(false!==strpos($do,"("));
$f=(false!==strpos($do,")"));
if ($o AND !$f) $ouverte=true;
- elseif (!$o AND $f) $ouverte=false;
- elseif ($o AND $f) $ouverte=false;
+ elseif ($f) $ouverte=false;
if (!$ouverte) $i++;
}
@@ -1236,8 +1235,8 @@ function _sqlite_modifier_table($table, $colonne, $opt=array(), $serveur=''){
// pour le INSERT INTO plus loin
// stocker la correspondance nouvelles->anciennes colonnes
$fields_correspondances = array();
-
foreach ($def_origine['field'] as $c=>$d){
+
if ($colonne_origine && ($c == $colonne_origine)) {
// si pas DROP
if ($colonne_destination){
--
GitLab