[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[28906] trunk

[<sy...@us...>]

Revision: 28906
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=28906&view=rev
Author:   sylvieg
Date:     2010-09-03 18:04:13 +0000 (Fri, 03 Sep 2010)

Log Message:
-----------
[FIX]ARTICLES: do not display a pagination when a second ARTICLES does not use it

Modified Paths:
--------------
    trunk/lib/wiki-plugins/wikiplugin_articles.php
    trunk/templates/tiki-view_articles.tpl

Modified: trunk/lib/wiki-plugins/wikiplugin_articles.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_articles.php	2010-09-03 17:56:16 UTC (rev 28905)
+++ trunk/lib/wiki-plugins/wikiplugin_articles.php	2010-09-03 18:04:13 UTC (rev 28906)
@@ -231,7 +231,7 @@
 		$smarty->assign_by_ref('offset', $start);
 		$smarty->assign_by_ref('cant', $listpages['cant']);
 	}
-	
+	$marty->assign('usePagination', $usePagination);
 	$smarty->assign_by_ref('listpages', $listpages["data"]);
 
 	if (isset($titleonly) && $titleonly == 'y') {

Modified: trunk/templates/tiki-view_articles.tpl
===================================================================
--- trunk/templates/tiki-view_articles.tpl	2010-09-03 17:56:16 UTC (rev 28905)
+++ trunk/templates/tiki-view_articles.tpl	2010-09-03 18:04:13 UTC (rev 28906)
@@ -153,10 +153,12 @@
 			</div>
 		</div>
 	{/if}
+{if $usePagination ne 'y'}
+	{pagination_links cant=$cant step=$maxArticles offset=$offset}{/pagination_links}
+{/if}
 {sectionelse}
 	{if $quiet ne 'y'}{tr}No articles yet.{/tr}
 		{if $tiki_p_edit_article eq 'y'}<a href="tiki-edit_article.php">{tr}Add an article{/tr}</a>{/if}
 	{/if}
 {/section}
 
-{pagination_links cant=$cant step=$maxArticles offset=$offset}{/pagination_links}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.