|
|
|
@ -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') |
|
|
|
|