From 1093d3976835ee7a12372a892955a3e0848e71b0 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Mon, 9 Feb 2009 14:31:48 +0000 Subject: [PATCH] * 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. --- includes/GlobalFunctions.php | 4 ++-- includes/Pager.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php index 3efb266a72..c9a7693b40 100644 --- a/includes/GlobalFunctions.php +++ b/includes/GlobalFunctions.php @@ -986,11 +986,11 @@ function wfViewPrevNext( $offset, $limit, $link, $query = '', $atend = false ) { } else { $nlink = '{$next}"; } - $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 3aa05c9226..8faec53322 100644 --- 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 ); -- 2.20.1