diff --git a/ecrire/public/criteres.php b/ecrire/public/criteres.php index ce3fa74a6d8627fedfd78791717d21adda4a459c..5c39739f459f2ef24d7a789d43268655b15f3f47 100644 --- a/ecrire/public/criteres.php +++ b/ecrire/public/criteres.php @@ -171,11 +171,17 @@ function critere_traduction_dist($idb, &$boucles, $crit) { $table = $boucle->id_table; $arg = kwote(calculer_argument_precedent($idb, 'id_trad', $boucles)); $dprim = kwote(calculer_argument_precedent($idb, $prim, $boucles)); - $boucle->where[]= array("'AND'", - array("'>'", "'$table.". "id_trad'", 0), + $boucle->where[]= array("'OR'", - array("'='", "'$table." . "id_trad'", $arg), - array("'='", "'$table.$prim'", $dprim))); + array("'AND'", + array("'='", "'$table.id_trad'", 0), + array("'='", "'$table.$prim'", $dprim) + ), + array("'AND'", + array("'>'", "'$table.id_trad'", 0), + array("'='", "'$table.id_trad'", $arg) + ) + ); } // {origine_traduction}