Update of /home/spip-cvs/spip/ecrire
In directory alan:/tmp/cvs-serv8964/ecrire
Modified Files:
controle_petition.php3 inc_presentation.php3
Log Message:
bug previsualisation avec les post-datés
Index: controle_petition.php3
RCS file: /home/spip-cvs/spip/ecrire/controle_petition.php3,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- controle_petition.php3 22 Aug 2004 21:03:04 -0000 1.19
+++ controle_petition.php3 26 Aug 2004 10:33:53 -0000 1.20
@@ -72,7 +72,7 @@
$id_article = $row['id_article'];
$titre = typo($row["titre"]);
}
- echo "<P align='right'><A HREF='../spip_redirect.php3?id_article=$id_article&recalcul=oui'>$titre</A>";
+ echo "<P align='right'><A HREF='../spip_redirect.php3?id_article=$id_article'>$titre</A>";
echo "</TD></TR></TABLE>";
Index: inc_presentation.php3
RCS file: /home/spip-cvs/spip/ecrire/inc_presentation.php3,v
retrieving revision 1.431
retrieving revision 1.432
diff -u -d -r1.431 -r1.432
--- inc_presentation.php3 26 Aug 2004 03:47:01 -0000 1.431
+++ inc_presentation.php3 26 Aug 2004 10:33:53 -0000 1.432
@@ -3000,36 +3000,29 @@
function voir_en_ligne ($type, $id, $statut=false, $image='racine-24.gif') {
global $connect_statut;
- $en_ligne = false;
- if (lire_meta('preview') != 'non'
- AND ($connect_statut == '0minirezo'
- OR (lire_meta('preview')=='1comite' AND $connect_statut=='1comite')
- ))
- $preview = 'preview';
-
switch ($type) {
case 'article':
if ($statut == "publie" AND lire_meta("post_dates") == 'non'
- AND spip_fetch_array(spip_query("SELECT id_article
+ AND !spip_fetch_array(spip_query("SELECT id_article
FROM spip_articles WHERE id_article=$id AND date<=NOW()")))
$statut = 'prop';
if ($statut == 'publie')
$en_ligne = 'recalcul';
else
- $en_ligne = $preview;
+ $en_ligne = 'preview';
break;
case 'rubrique':
if ($id > 0)
if ($statut == 'publie')
$en_ligne = 'recalcul';
else
- $en_ligne = $preview;
+ $en_ligne = 'preview';
break;
case 'breve':
if ($statut == 'publie')
$en_ligne = 'recalcul';
else if ($statut == 'prop')
- $en_ligne = $preview;
+ $en_ligne = 'preview';
break;
case 'mot':
$en_ligne = 'recalcul';
@@ -3038,10 +3031,18 @@
if ($en_ligne == 'recalcul')
$message = _T('icone_voir_en_ligne');
- else if ($en_ligne == 'preview')
- $message = _L('Prévisualiser');
+ else if ($en_ligne == 'preview') {
+ // est-ce autorise ?
+ if (lire_meta('preview') == 'non'
+ OR (lire_meta('preview') == '1comite'
+ AND $connect_statut=='1comite')
+ )
+ $message = '';
+ else
+ $message = _L('Prévisualiser');
+ }
- if ($en_ligne)
+ if ($message)
icone_horizontale($message, "../spip_redirect.php3?id_$type=$id&$en_ligne=oui", $image, "rien.gif");
}