change printPageNavi() to getPageNavi() to allow some more flexibility

diff --git a/help/templates/index.php b/help/templates/index.php
index 262ab3d8cabfc785f65d8b84a04543b9292e4b36..a117c3d5fb40195c4dc200a1d43a82be12a15f87 100644 (file)
--- a/help/templates/index.php
+++ b/help/templates/index.php
@@ -15,7 +15,8 @@
 </table>
 <?php
        $url=OC_HELPER::linkTo( "help", "index.php" ).'?page=';
-       OC_UTIL::showPageNavi($_['pagecount'],$_['page'],$url);
+       $pageNavi=OC_UTIL::getPageNavi($_['pagecount'],$_['page'],$url);
+       $pageNavi->printPage();
 ?>
 <a target="_blank" class="prettybutton" href="http://apps.owncloud.com/knowledgebase/editquestion.php?action=new">ASK A QUESTION</a>
 

diff --git a/lib/base.php b/lib/base.php
index 324b2f7e0a022b8e801473cbfc6b7f326996dc84..1ab9b23bccb3e5f91382be05f27d5a01f03c920b 100644 (file)
--- a/lib/base.php
+++ b/lib/base.php
@@ -244,9 +244,9 @@ class OC_UTIL {
         * @param int $pagecount
         * @param int $page
         * @param string $url
-        * @return html-string
+        * @return OC_TEMPLATE
         */
-       public static function showPageNavi($pagecount,$page,$url) {
+       public static function getPageNavi($pagecount,$page,$url) {
 
                $pagelinkcount=8;
                if ($pagecount>1) {
@@ -261,7 +261,7 @@ class OC_UTIL {
                        $tmpl->assign('pagestart',$pagestart);
                        $tmpl->assign('pagestop',$pagestop);
                        $tmpl->assign('url',$url);
-                       $tmpl->printPage();
+                       return $tmpl;
                }
        }