From aebcd58a66289805d34cd745e83b79c08624b75f Mon Sep 17 00:00:00 2001 From: "Committo,Ergo:sum" <esj@rezo.net> Date: Thu, 2 Nov 2006 14:40:15 +0000 Subject: [PATCH] =?UTF-8?q?Petite=20incoh=C3=A9rence=20dans=20la=20nouvell?= =?UTF-8?q?e=20interface=20d'autorisation=20(instituer=5Farticle=20=C3=A9t?= =?UTF-8?q?ait=20appelee=20bien=20qu'ind=C3=A9finie).=20Et=20p=C3=A9touill?= =?UTF-8?q?e=20graphique=20dans=20l'icone=20d'un=20admin=20restreint.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecrire/exec/articles.php | 2 +- ecrire/inc/formater_article.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ecrire/exec/articles.php b/ecrire/exec/articles.php index 9250167b0b..83e7790764 100644 --- a/ecrire/exec/articles.php +++ b/ecrire/exec/articles.php @@ -100,7 +100,7 @@ function articles_affiche($id_article, $row, $cherche_auteur, $ids, $cherche_mot $iconifier = charger_fonction('iconifier', 'inc'); else $iconifier = ''; - if ($flag_editable) + if ($statut_rubrique) $instituer_article = charger_fonction('instituer_article', 'inc'); else $instituer_article =''; diff --git a/ecrire/inc/formater_article.php b/ecrire/inc/formater_article.php index 5ecb99b4f8..1c1dc00703 100644 --- a/ecrire/inc/formater_article.php +++ b/ecrire/inc/formater_article.php @@ -26,7 +26,7 @@ function inc_formater_article_dist($row) if ($chercher_logo) $chercher_logo = charger_fonction('chercher_logo', 'inc'); $formater_auteur = charger_fonction('formater_auteur', 'inc'); - $img_admin = http_img_pack("admin-12.gif", "", "width='12' height='12'", _T('titre_image_admin_article')); + $img_admin = http_img_pack("admin-12.gif", "", " width='12' height='12'", _T('titre_image_admin_article')); $nb = ($options != "avancees") ? '' : _T('info_numero_abbreviation'); @@ -60,7 +60,6 @@ function inc_formater_article_dist($row) $vals[]= puce_statut_article($id_article, $statut, $id_rubrique); $vals[]= "<div>" - . (acces_restreint_rubrique($id_rubrique) ? $img_admin : '') . "<a href='" . generer_url_ecrire("articles","id_article=$id_article") . "'" @@ -70,6 +69,7 @@ function inc_formater_article_dist($row) . " style=\"display:block;\">" . (!$logo ? '' : ("<div style='float: $spip_lang_right; margin-top: -2px; margin-bottom: -2px;'>" . $logo . "</div>")) + . (acces_restreint_rubrique($id_rubrique) ? $img_admin : '') . typo($titre) . (!($afficher_langue AND $lang != $GLOBALS['meta']['langue_site']) ? '' : (" <font size='1' color='#666666'$dir_lang>(".traduire_nom_langue($lang).")</font>")) -- GitLab