Index: src/main/resources/Blog/Macros
===================================================================
--- src/main/resources/Blog/Macros	(revision 5194)
+++ src/main/resources/Blog/Macros	(working copy)
@@ -68,8 +68,6 @@
 #set($inbitems = $xwiki.parseInt($nbitems))
 #set($inbstart = $xwiki.parseInt($nbstart))
 #foreach ($item in $xwiki.searchDocuments($sql, $inbitems, $inbstart))
-## The default foreach counter, $velocityCount, cannot be used outside of the foreach body!
-#set($velocityCountOutsideForeachBody = $velocityCount)
 #set($bentrydoc = $xwiki.getDocument($item))
 #if($bentrydoc.fullName == $item)
 #set($bentryobj = $bentrydoc.getObject("XWiki.ArticleClass"))
@@ -103,15 +101,19 @@
 #end
 ##
 ## prev/next links
-#if(($inbstart != 0) || ($velocityCountOutsideForeachBody==$inbitems))
+#if (!$velocityCount)
+## if $velocityCount has not been initialized (e.g. $xwiki.searchDocuments has returned an empty list)
+#set($velocityCount = -1)
+#end
+#if(($inbstart != 0) || ($velocityCount==$inbitems))
 <div class="pagingLinks">
 #if ($inbstart!=0)
 #set($iprev = $inbstart - $inbitems)
-<span class="prevPage">[Previous>$doc.name?nbstart=${iprev}]</span>
+<span class="prevPage">[Previous>$doc.name?category=$!category&nbstart=${iprev}]</span>
 #end
-#if($velocityCountOutsideForeachBody==$inbitems)
+#if($velocityCount==$inbitems)
 #set($inext = $inbstart + $inbitems)
-<span class="nextPage">[Next>$doc.name?nbstart=${inext}]</span>
+<span class="nextPage">[Next>$doc.name?category=$!category&nbstart=${inext}]</span>
 #end
 <span class="clear"></span>
 </div> ## pagingLinks