From 0ba9aa5e21f35b41f0d044b3c63c376137e9de2f Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Wed, 2 Jan 2008 17:12:28 +0000
Subject: [PATCH] =?UTF-8?q?Interdire=20les=20doublons=20sur=20cl=C3=A9=20p?=
 =?UTF-8?q?rimaire=20non=20atomique,=20c'est=20ing=C3=A9rable.=20Probl?=
 =?UTF-8?q?=C3=A8me=20signal=C3=A9=20par=20#680.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ecrire/public/criteres.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ecrire/public/criteres.php b/ecrire/public/criteres.php
index 05c0257b0b..612180840e 100644
--- a/ecrire/public/criteres.php
+++ b/ecrire/public/criteres.php
@@ -57,8 +57,10 @@ function critere_doublons_dist($idb, &$boucles, $crit) {
 	$boucle = &$boucles[$idb];
 	$primary = $boucle->primary;
 
-	if (!$primary)
-		erreur_squelette(_T('zbug_doublon_table_sans_index'), "BOUCLE$idb");
+	if (!$primary OR strpos($primary,','))
+#		erreur_squelette(_T('zbug_doublon_table_sans_index'), "BOUCLE$idb");
+// changer un peu le libelle
+		erreur_squelette(_L('doublon_sur_table_sans_cle_primaire_atomique'), "BOUCLE$idb");
 	$not = ($crit->not ? '' : 'NOT');
 
 	$nom = !isset($crit->param[0]) ? "''" : calculer_liste($crit->param[0], array(), $boucles, $boucles[$idb]->id_parent);
-- 
GitLab