* remove forgotten case of hard coded pipe separator in Pager

* fix bug in GlobalFunctions.php introduced in r47028. pipeList() needs to be fed an array.

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 3efb266..c9a7693 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -986,11 +986,11 @@ function wfViewPrevNext( $offset, $limit, $link, $query = '', $atend = false ) {
        } else {
                $nlink = '<a href="' . $title->escapeLocalUrl( $q ) . "\" class=\"mw-nextlink\">{$next}</a>";
        }
-       $nums = $wgLang->pipeList( wfNumLink( $offset, 20, $title, $query ),
+       $nums = $wgLang->pipeList( array( wfNumLink( $offset, 20, $title, $query ),
          wfNumLink( $offset, 50, $title, $query ),
          wfNumLink( $offset, 100, $title, $query ),
          wfNumLink( $offset, 250, $title, $query ),
-         wfNumLink( $offset, 500, $title, $query ) );
+         wfNumLink( $offset, 500, $title, $query ) ) );
 
        return wfMsg( 'viewprevnext', $plink, $nlink, $nums );
 }

diff --git a/includes/Pager.php b/includes/Pager.php
index 3aa05c9..8faec53 100644 (file)
--- a/includes/Pager.php
+++ b/includes/Pager.php
@@ -533,7 +533,7 @@ abstract class AlphabeticPager extends IndexPager {
                $limits = $wgLang->pipeList( $limitLinks );
 
                $this->mNavigationBar =
-                       "({$pagingLinks['first']} | {$pagingLinks['last']}) " .
+                       "(" . $wgLang->pipeList( array( $pagingLinks['first'], $pagingLinks['last'] ) ) . ") " .
                        wfMsgHtml( 'viewprevnext', $pagingLinks['prev'],
                        $pagingLinks['next'], $limits );