Commit d878d695 authored by sylvieg's avatar sylvieg

Instant-Auto-Merge from BRANCH-1-9 to HEAD

parent c05becda
{* $Header: /cvsroot/tikiwiki/tiki/templates/tiki-list_articles.tpl,v 1.46 2007-08-01 20:25:14 ricks99 Exp $ *}
{* $Header: /cvsroot/tikiwiki/tiki/templates/tiki-list_articles.tpl,v 1.47 2007-08-02 13:06:48 sylvieg Exp $ *}
<h1><a class="pagetitle" href="tiki-list_articles.php">{tr}Articles{/tr}</a>
......@@ -61,7 +61,7 @@ $sort_mode eq 'nbreads_desc'}nbreads_asc{else}nbreads_desc{/if}">{tr}Reads{/tr}<
{if $art_list_img eq 'y'}
<td class="heading">{tr}Img{/tr}</td>
{/if}
<td class="heading">{tr}Action{/tr}</td>
{if $tiki_p_edit_article eq 'y' or $tiki_p_remove_article eq 'y' or isset($oneEditPage)}<td class="heading">{tr}Action{/tr}</td>{/if}
</tr>
{cycle values="odd,even" print=false}
{section name=changes loop=$listpages}
......@@ -144,4 +144,4 @@ $sort_mode eq 'nbreads_desc'}nbreads_asc{else}nbreads_desc{/if}">{tr}Reads{/tr}<
{/if}
</div>
{/if}
</div>
<?php
// $Header: /cvsroot/tikiwiki/tiki/tiki-list_articles.php,v 1.33 2007-04-02 17:21:18 sylvieg Exp $
// $Header: /cvsroot/tikiwiki/tiki/tiki-list_articles.php,v 1.34 2007-08-02 13:06:48 sylvieg Exp $
// Copyright (c) 2002-2007, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
// All Rights Reserved. See copyright.txt for details and a complete list of authors.
......@@ -156,6 +156,15 @@ if ($feature_multilingual == 'y') {
$smarty->assign_by_ref('available_languages', $avls);
}
if ($tiki_p_edit_article != 'y' && $tiki_p_remove_article != 'y') { //check one editable
foreach ($listpages['data'] as $page) {
if ($page['author'] == $user && $page['creator_edit'] == 'y') {
$smarty->assign('oneEditPage', 'y');
break;
}
}
}
include_once ('tiki-section_options.php');
if ($feature_mobile =='y' && isset($_REQUEST['mode']) && $_REQUEST['mode'] == 'mobile') {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment