From 7be2b00029098e5a272bd67c80c790f498162ab6 Mon Sep 17 00:00:00 2001
From: Fil <fil@rezo.net>
Date: Sun, 28 May 2006 21:11:06 +0000
Subject: [PATCH] =?UTF-8?q?lien=20de=20trad=20non=20pris=20en=20compte=20l?=
 =?UTF-8?q?ors=20de=20la=20cr=C3=A9ation=20=C3=A0=20cause=20du=20renvoi=20?=
 =?UTF-8?q?vers=20la=20page=20article=3Fid=5Farticle=3Dxxx=20;=20mais=20le?=
 =?UTF-8?q?=20probl=C3=A8me=20c'est=20qu'il=20faut=20s=C3=A9parer=20les=20?=
 =?UTF-8?q?phases=20update/affichage?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ecrire/exec/articles.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/ecrire/exec/articles.php b/ecrire/exec/articles.php
index 17cfe73031..927f2b184c 100644
--- a/ecrire/exec/articles.php
+++ b/ecrire/exec/articles.php
@@ -756,7 +756,7 @@ function langues_articles($id_article, $langue_article, $flag_editable, $id_rubr
 
 		// Changer article de reference de la trad
 		if ($id_trad_new = intval($id_trad_new)
-		AND $id_trad_old = intval($id_trad_old)
+		AND $id_trad_old = intval(_request('id_trad_old'))  # bizarre
 		AND $connect_statut=='0minirezo'
 		AND $connect_toutes_rubriques) { 
 			spip_query("UPDATE spip_articles SET id_trad = $id_trad_new, date_modif=NOW() WHERE id_trad = $id_trad_old");
@@ -1547,7 +1547,10 @@ if (isset($_POST['titre'])) {
  }
 
 
-	if ($new == 'oui')
+	// renvoyer vers la page de l'article
+	if ($new == 'oui'
+	AND ! $lier_trad  # sauf dans le cas d'un lier_trad car le code de mise a jour du lien est au meme endroit que l'affichage (a corriger).
+	)
 		redirige_par_entete(
 			generer_url_ecrire('articles', 'id_article='.$id_article, '&'));
 
-- 
GitLab