diff --git a/ecrire/exec/articles.php b/ecrire/exec/articles.php index 9250167b0bc1464737323e1da47c0c70c953a0a4..83e77907648a11a6a1ce6c6a264aa480146dff4a 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 5ecb99b4f8da0d2d691b5cd51d0c3ea6fe9808e9..1c1dc00703f789f790b820b4e8d686af6e19fff3 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>"))