From 646de0aa0c4848daf7b3f6fb103c3e946b1e8fd0 Mon Sep 17 00:00:00 2001
From: Fil <fil@rezo.net>
Date: Wed, 13 Jun 2007 08:34:47 +0000
Subject: [PATCH] une version tous MySQL (et debuguee) de plonger.php, suite de
[9541]
---
ecrire/exec/auteurs.php | 2 +-
ecrire/inc/plonger.php | 21 +++++++--------------
2 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/ecrire/exec/auteurs.php b/ecrire/exec/auteurs.php
index 0413830eb6..19d4ac8a1f 100644
--- a/ecrire/exec/auteurs.php
+++ b/ecrire/exec/auteurs.php
@@ -79,7 +79,7 @@ function bandeau_auteurs($tri, $visiteurs)
$ret .= "\n<p class='arial1'>"._T('info_gauche_auteurs'). '</p>';
if ($connect_statut == '0minirezo')
- $ret .= "\n<br />". _T('info_gauche_auteurs_exterieurs');
+ $ret .= "\n<p class='arial1'>". _T('info_gauche_auteurs_exterieurs') . '</p>';
$ret .= fin_boite_info(true);
diff --git a/ecrire/inc/plonger.php b/ecrire/inc/plonger.php
index e1b26747dd..19c72228c3 100644
--- a/ecrire/inc/plonger.php
+++ b/ecrire/inc/plonger.php
@@ -31,28 +31,21 @@ function inc_plonger_dist($id_rubrique, $idom="", $list=array(), $col = 1, $excl
$res = spip_query("
SELECT
- rub1.id_rubrique, rub1.titre, rub1.id_parent, rub1.lang, rub1.langue_choisie
+ rub1.id_rubrique, rub1.titre, rub1.id_parent, rub1.lang, rub1.langue_choisie, rub2.id_rubrique AS id_enfant
FROM spip_rubriques AS rub1
+ LEFT JOIN spip_rubriques AS rub2
+ ON (rub1.id_rubrique = rub2.id_parent)
WHERE rub1.id_parent = "._q($id_rubrique)."
AND rub1.id_rubrique!="._q($exclu)."
-
- UNION
-
- SELECT
- rub1.id_rubrique, rub1.titre, rub1.id_parent, rub1.lang, rub1.langue_choisie
- FROM spip_rubriques AS rub1, spip_rubriques AS rub2
- WHERE rub2.id_parent = "._q($id_rubrique)."
- AND rub1.id_parent=rub2.id_rubrique
- AND rub1.id_rubrique!="._q($exclu)."
-
- ORDER BY 0+titre,titre
+ AND (rub2.id_rubrique IS NULL OR rub2.id_rubrique!="._q($exclu).")
+ GROUP BY rub1.id_rubrique
+ ORDER BY 0+rub1.titre,rub1.titre
"
);
-
while ($row = spip_fetch_array($res)) {
if (autoriser('voir','rubrique',$row['id_rubrique'])){
- $rub[$row['id_parent']]['enfants'] = true;
+ $rub[$row['id_rubrique']]['enfants'] = $row['id_enfant'];
if ($row['id_parent'] == $id_rubrique) {
$t = trim(typo(supprimer_numero($row['titre'])));
if ($row['langue_choisie'] != 'oui')
--
GitLab