From a1192e62f334e1c3da3b3ac78c160a833e665dc7 Mon Sep 17 00:00:00 2001
From: Fil <fil@rezo.net>
Date: Thu, 2 Sep 2004 12:42:44 +0000
Subject: [PATCH] =?UTF-8?q?traiter=20le=20cas=20obsccur=20des=20articles,?=
=?UTF-8?q?=20rubriques=20etc=20non=20dat=C3=A9s=20(quand=20rien=20n'?=
=?UTF-8?q?=C3=A9tait=20dat=C3=A9=20dans=20les=20sous-rubriques,=20la=20ru?=
=?UTF-8?q?brique=20ne=20se=20publiait=20pas)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ecrire/inc_rubriques.php3 | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/ecrire/inc_rubriques.php3 b/ecrire/inc_rubriques.php3
index e216893fd5..5205a2ba5d 100644
--- a/ecrire/inc_rubriques.php3
+++ b/ecrire/inc_rubriques.php3
@@ -44,7 +44,7 @@ function calculer_rubriques() {
max(fille.date_heure) AS date_h
FROM spip_rubriques AS rub, spip_breves AS fille
WHERE rub.id_rubrique = fille.id_rubrique
- AND rub.date_tmp < fille.date_heure AND fille.statut='publie'
+ AND rub.date_tmp <= fille.date_heure AND fille.statut='publie'
GROUP BY fille.id_rubrique");
while ($row = spip_fetch_array($r))
spip_query("UPDATE spip_rubriques
@@ -54,7 +54,7 @@ function calculer_rubriques() {
// Publier et dater les rubriques qui ont un site publie
$r = spip_query("SELECT rub.id_rubrique AS id, max(fille.date) AS date_h
FROM spip_rubriques AS rub, spip_syndic AS fille
- WHERE rub.id_rubrique = fille.id_rubrique AND rub.date_tmp < fille.date
+ WHERE rub.id_rubrique = fille.id_rubrique AND rub.date_tmp <= fille.date
AND fille.statut='publie' GROUP BY fille.id_rubrique");
while ($row = spip_fetch_array($r))
spip_query("UPDATE spip_rubriques
@@ -66,7 +66,7 @@ function calculer_rubriques() {
FROM spip_rubriques AS rub, spip_documents AS fille,
spip_documents_rubriques AS lien
WHERE rub.id_rubrique = lien.id_rubrique
- AND lien.id_document=fille.id_document AND rub.date_tmp < fille.date
+ AND lien.id_document=fille.id_document AND rub.date_tmp <= fille.date
GROUP BY lien.id_rubrique");
while ($row = spip_fetch_array($r))
spip_query("UPDATE spip_rubriques
@@ -82,7 +82,8 @@ function calculer_rubriques() {
max(fille.date_tmp) AS date_h
FROM spip_rubriques AS rub, spip_rubriques AS fille
WHERE rub.id_rubrique = fille.id_parent
- AND rub.date_tmp < fille.date_tmp AND fille.statut='publie'
+ AND (rub.date_tmp < fille.date_tmp OR rub.statut_tmp<>'publie')
+ AND fille.statut_tmp='publie'
GROUP BY fille.id_parent");
while ($row = spip_fetch_array($r)) {
spip_query("UPDATE spip_rubriques
--
GitLab