r40997 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r40996‎ | r40997 | r40998 >
Date:17:11, 18 September 2008
Author:brion
Status:old
Tags:
Comment:
Revert r40953 '(bug 7509) Don't hardcode separation strings, make them configurable'

This seems to make code much uglier and harder to maintain -- there are a bajillion new calls to "wfMsgExt( 'pipe-separator' , 'escapenoentities' )" which is not trivial or easy to remember. This makes code uglier, harder to read, harder to maintain, and more prone to error.
Modified paths:
  • /trunk/phase3/includes/GlobalFunctions.php (modified) (history)
  • /trunk/phase3/includes/Linker.php (modified) (history)
  • /trunk/phase3/includes/PageHistory.php (modified) (history)
  • /trunk/phase3/includes/Pager.php (modified) (history)
  • /trunk/phase3/includes/Skin.php (modified) (history)
  • /trunk/phase3/includes/WatchlistEditor.php (modified) (history)
  • /trunk/phase3/includes/specials/SpecialAllmessages.php (modified) (history)
  • /trunk/phase3/includes/specials/SpecialAllpages.php (modified) (history)
  • /trunk/phase3/includes/specials/SpecialBlockip.php (modified) (history)
  • /trunk/phase3/includes/specials/SpecialContributions.php (modified) (history)
  • /trunk/phase3/includes/specials/SpecialNewpages.php (modified) (history)
  • /trunk/phase3/includes/specials/SpecialPreferences.php (modified) (history)
  • /trunk/phase3/includes/specials/SpecialPrefixindex.php (modified) (history)
  • /trunk/phase3/includes/specials/SpecialRecentchanges.php (modified) (history)
  • /trunk/phase3/includes/specials/SpecialUserlogin.php (modified) (history)
  • /trunk/phase3/includes/specials/SpecialWatchlist.php (modified) (history)
  • /trunk/phase3/includes/specials/SpecialWhatlinkshere.php (modified) (history)
  • /trunk/phase3/languages/messages/MessagesEn.php (modified) (history)
  • /trunk/phase3/maintenance/language/messageTypes.inc (modified) (history)
  • /trunk/phase3/maintenance/language/messages.inc (modified) (history)
  • /trunk/phase3/skins/CologneBlue.php (modified) (history)
  • /trunk/phase3/skins/Standard.php (modified) (history)

Diff [purge]

Index: trunk/phase3/skins/CologneBlue.php
——@@ -79,10 +79,9 @@
8080 }
8181 $s .= "<td class='bottom' align='center' valign='top'>";
8282
83 - $separator = wfMsgExt( 'pipe-separator' , 'escapenoentities' );
8483 $s .= $this->bottomLinks();
85 - $s .= "\n<br />" . $this->makeKnownLinkObj( Title::newMainPage() ) . $separator
86 - . $this->aboutLink() . $separator
 84+ $s .= "\n<br />" . $this->makeKnownLinkObj( Title::newMainPage() ) . " | "
 85+ . $this->aboutLink() . " | "
8786 . $this->searchForm( wfMsg( "qbfind" ) );
8887
8988 $s .= "\n<br />" . $this->pageStats();
——@@ -133,19 +132,22 @@
134133 $q = "returnto={$rt}";
135134 }
136135
137 - $separator = wfMsgExt( 'pipe-separator' , 'escapenoentities' );
138136 $s = "" .
139 - $this->mainPageLink(). $separator .
140 - $this->makeKnownLink( wfMsgForContent( "aboutpage" ), wfMsg( "about" ) ) . $separator .
141 - $this->makeKnownLink( wfMsgForContent( "helppage" ), wfMsg( "help" ) ) . $separator .
142 - $this->makeKnownLink( wfMsgForContent( "faqpage" ), wfMsg("faq") ) . $separator .
 137+ $this->mainPageLink()
 138+ . " | " .
 139+ $this->makeKnownLink( wfMsgForContent( "aboutpage" ), wfMsg( "about" ) )
 140+ . " | " .
 141+ $this->makeKnownLink( wfMsgForContent( "helppage" ), wfMsg( "help" ) )
 142+ . " | " .
 143+ $this->makeKnownLink( wfMsgForContent( "faqpage" ), wfMsg("faq") )
 144+ . " | " .
143145 $this->specialLink( "specialpages" );
144146
145147 /* show links to different language variants */
146148 $s .= $this->variantLinks();
147149 $s .= $this->extensionTabLinks();
148150
149 - $s .= $separator;
 151+ $s .= " | ";
150152 if ( $wgUser->isLoggedIn() ) {
151153 $s .= $this->makeKnownLink( $lo, wfMsg( "logout" ), $q );
152154 } else {
Index: trunk/phase3/skins/Standard.php
——@@ -107,13 +107,11 @@
108108 $l = $wgContLang->isRTL() ? 'right' : 'left';
109109 $s .= "<td class='bottom' align='$l' valign='top'>";
110110
111 - $separator = wfMsgExt( 'pipe-separator' , 'escapenoentities' );
112 -
113111 $s .= $this->bottomLinks();
114112 $s .= "\n<br />" . $this->mainPageLink()
115 - . $separator . $this->aboutLink()
116 - . $separator . $this->specialLink( 'recentchanges' )
117 - . $separator . $this->searchForm()
 113+ . ' | ' . $this->aboutLink()
 114+ . ' | ' . $this->specialLink( 'recentchanges' )
 115+ . ' | ' . $this->searchForm()
118116 . '<br /><span id="pagestats">' . $this->pageStats() . '</span>';
119117
120118 $s .= "</td>";
Index: trunk/phase3/languages/messages/MessagesEn.php
——@@ -3416,7 +3416,6 @@
34173417 'comma-separator' => ',&#32;', # only translate this message to other languages if you have to change it
34183418 'colon-separator' => ':&#32;', # only translate this message to other languages if you have to change it
34193419 'autocomment-prefix' => '-&#32;', # only translate this message to other languages if you have to change it
3420 -'pipe-separator' => '&#32;|&#32;', # only translate this message to other languages if you have to change it
34213420
34223421 # Multipage image navigation
34233422 'imgmultipageprev' => '← previous page',
Index: trunk/phase3/includes/PageHistory.php
——@@ -379,7 +379,7 @@
380380 }
381381
382382 if( $tools ) {
383 - $s .= ' (' . implode( wfMsgExt( 'pipe-separator' , 'escapenoentities' ), $tools ) . ')';
 383+ $s .= ' (' . implode( ' | ', $tools ) . ')';
384384 }
385385
386386 wfRunHooks( 'PageHistoryLineEnding', array( $this, &$row , &$s ) );
Index: trunk/phase3/includes/WatchlistEditor.php
——@@ -391,7 +391,7 @@
392392 }
393393 return '<li>'
394394 . Xml::check( 'titles[]', false, array( 'value' => $title->getPrefixedText() ) )
395 - . $link . ' (' . implode( wfMsgExt( 'pipe-separator' , 'escapenoentities' ), $tools ) . ')' . '</li>';
 395+ . $link . ' (' . implode( ' | ', $tools ) . ')' . '</li>';
396396 }
397397
398398 /**
——@@ -457,6 +457,6 @@
458458 foreach( $modes as $mode => $subpage ) {
459459 $tools[] = $skin->makeKnownLinkObj( SpecialPage::getTitleFor( 'Watchlist', $subpage ), wfMsgHtml( "watchlisttools-{$mode}" ) );
460460 }
461 - return implode( wfMsgExt( 'pipe-separator' , 'escapenoentities' ), $tools );
 461+ return implode( ' | ', $tools );
462462 }
463463 }
Index: trunk/phase3/includes/specials/SpecialPreferences.php
——@@ -634,7 +634,7 @@
635635 $this->tableRow(
636636 wfMsgExt( 'prefs-memberingroups', array( 'parseinline' ), count( $userEffectiveGroupsArray ) ),
637637 implode( wfMsg( 'comma-separator' ), $userEffectiveGroupsArray ) .
638 - '<br />(' . implode( wfMsgExt( 'pipe-separator' , 'escapenoentities' ), $toolLinks ) . ')'
 638+ '<br />(' . implode( ' | ', $toolLinks ) . ')'
639639 ) .
640640
641641 $this->tableRow(
Index: trunk/phase3/includes/specials/SpecialUserlogin.php
——@@ -970,7 +970,7 @@
971971 $links[] = $this->makeLanguageSelectorLink( $parts[0], $parts[1] );
972972 }
973973 }
974 - return count( $links ) > 0 ? wfMsgHtml( 'loginlanguagelabel', implode( wfMsgExt( 'pipe-separator' , 'escapenoentities' ), $links ) ) : '';
 974+ return count( $links ) > 0 ? wfMsgHtml( 'loginlanguagelabel', implode( ' | ', $links ) ) : '';
975975 } else {
976976 return '';
977977 }
Index: trunk/phase3/includes/specials/SpecialWhatlinkshere.php
——@@ -340,7 +340,7 @@
341341 $limitLinks[] = $this->makeSelfLink( $prettyLimit, wfArrayToCGI( $overrides, $changed ) );
342342 }
343343
344 - $nums = implode ( wfMsgExt( 'pipe-separator' , 'escapenoentities' ), $limitLinks );
 344+ $nums = implode ( ' | ', $limitLinks );
345345
346346 return wfMsgHtml( 'viewprevnext', $prev, $next, $nums );
347347 }
——@@ -403,6 +403,6 @@
404404 $overrides = array( $type => !$chosen );
405405 $links[] = $this->makeSelfLink( $msg, wfArrayToCGI( $overrides, $changed ) );
406406 }
407 - return Xml::fieldset( wfMsg( 'whatlinkshere-filters' ), implode( wfMsgExt( 'pipe-separator' , 'escapenoentities' ), $links ) );
 407+ return Xml::fieldset( wfMsg( 'whatlinkshere-filters' ), implode( '&nbsp;|&nbsp;', $links ) );
408408 }
409409 }
Index: trunk/phase3/includes/specials/SpecialRecentchanges.php
——@@ -618,16 +618,14 @@
619619 $cl[] = $this->makeOptionsLink( $wgLang->formatNum( $value ),
620620 array( 'limit' => $value ), $nondefaults, $value == $options['limit'] ) ;
621621 }
 622+ $cl = implode( ' | ', $cl );
622623
623 - $separator = wfMsgExt( 'pipe-separator' , 'escapenoentities' );
624 - $cl = implode( $separator, $cl );
625 -
626624 // day links, reset 'from' to none
627625 foreach( $wgRCLinkDays as $value ) {
628626 $dl[] = $this->makeOptionsLink( $wgLang->formatNum( $value ),
629627 array( 'days' => $value, 'from' => '' ), $nondefaults, $value == $options['days'] ) ;
630628 }
631 - $dl = implode( $separator, $dl );
 629+ $dl = implode( ' | ', $dl );
632630
633631
634632 // show/hide links
——@@ -652,7 +650,7 @@
653651 if( $wgUser->useRCPatrol() )
654652 $links[] = wfMsgHtml( 'rcshowhidepatr', $patrLink );
655653 $links[] = wfMsgHtml( 'rcshowhidemine', $myselfLink );
656 - $hl = implode( $separator, $links );
 654+ $hl = implode( ' | ', $links );
657655
658656 // show from this onward link
659657 $now = $wgLang->timeanddate( wfTimestampNow(), true );
Index: trunk/phase3/includes/specials/SpecialPrefixindex.php
——@@ -175,7 +175,7 @@
176176 wfMsg ( 'allpages' ) );
177177 if( isset( $res ) && $res && ( $n == $this->maxPerPage ) && ( $s = $res->fetchObject() ) ) {
178178 $namespaceparam = $namespace ? "&namespace=$namespace" : "";
179 - $out2 .= wfMsgExt( 'pipe-separator' , 'escapenoentities' ) . $sk->makeKnownLinkObj(
 179+ $out2 .= " | " . $sk->makeKnownLinkObj(
180180 $self,
181181 wfMsgHtml( 'nextpage', htmlspecialchars( $s->page_title ) ),
182182 "from=" . wfUrlEncode( $s->page_title ) .
Index: trunk/phase3/includes/specials/SpecialAllpages.php
——@@ -328,8 +328,6 @@
329329 }
330330 }
331331
332 - $separator = wfMsgExt( 'pipe-separator' , 'escapenoentities' );
333 -
334332 if ( $this->including() ) {
335333 $out2 = '';
336334 } else {
——@@ -384,7 +382,7 @@
385383 . ( $namespace ? '&namespace=' . $namespace : '' );
386384 $prevLink = $sk->makeKnownLinkObj( $self,
387385 wfMsgHTML( 'prevpage', htmlspecialchars( $pt ) ), $q );
388 - $out2 .= $separator . $prevLink;
 386+ $out2 .= ' | ' . $prevLink;
389387 }
390388
391389 if( $n == $this->maxPerPage && $s = $res->fetchObject() ) {
——@@ -394,7 +392,7 @@
395393 . ( $namespace ? '&namespace=' . $namespace : '' );
396394 $nextLink = $sk->makeKnownLinkObj( $self,
397395 wfMsgHtml( 'nextpage', htmlspecialchars( $t->getText() ) ), $q );
398 - $out2 .= $separator . $nextLink;
 396+ $out2 .= ' | ' . $nextLink;
399397 }
400398 $out2 .= "</td></tr></table><hr />";
401399 }
——@@ -406,7 +404,7 @@
407405 $wgOut->addHTML( $prevLink );
408406 }
409407 if( isset( $prevLink ) && isset( $nextLink ) ) {
410 - $wgOut->addHTML( $separator );
 408+ $wgOut->addHTML( ' | ' );
411409 }
412410 if( isset( $nextLink ) ) {
413411 $wgOut->addHTML( $nextLink );
Index: trunk/phase3/includes/specials/SpecialContributions.php
——@@ -338,7 +338,7 @@
339339
340340 wfRunHooks( 'ContributionsToolLinks', array( $id, $nt, &$tools ) );
341341
342 - $links = implode( wfMsgExt( 'pipe-separator' , 'escapenoentities' ), $tools );
 342+ $links = implode( ' | ', $tools );
343343 }
344344
345345 // Old message 'contribsub' had one parameter, but that doesn't work for
Index: trunk/phase3/includes/specials/SpecialNewpages.php
——@@ -148,7 +148,7 @@
149149 $links[$key] = wfMsgHtml( $msg, $link );
150150 }
151151
152 - return implode( wfMsgExt( 'pipe-separator' , 'escapenoentities' ), $links );
 152+ return implode( ' | ', $links );
153153 }
154154
155155 protected function form() {
Index: trunk/phase3/includes/specials/SpecialBlockip.php
——@@ -463,7 +463,7 @@
464464 $links[] = $skin->makeLink ( 'MediaWiki:Ipbreason-dropdown', wfMsgHtml( 'ipb-edit-dropdown' ) );
465465 $links[] = $this->getUnblockLink( $skin );
466466 $links[] = $this->getBlockListLink( $skin );
467 - return '<p class="mw-ipb-conveniencelinks">' . implode( wfMsgExt( 'pipe-separator' , 'escapenoentities' ), $links ) . '</p>';
 467+ return '<p class="mw-ipb-conveniencelinks">' . implode( ' | ', $links ) . '</p>';
468468 }
469469
470470 /**
Index: trunk/phase3/includes/specials/SpecialWatchlist.php
——@@ -271,7 +271,7 @@
272272 # Namespace filter and put the whole form together.
273273 $form .= $wlInfo;
274274 $form .= $cutofflinks;
275 - $form .= implode( wfMsgExt( 'pipe-separator' , 'escapenoentities' ), $links );
 275+ $form .= implode( ' | ', $links );
276276 $form .= Xml::openElement( 'form', array( 'method' => 'post', 'action' => $thisTitle->getLocalUrl() ) );
277277 $form .= '<p>';
278278 $form .= Xml::label( wfMsg( 'namespace' ), 'namespace' ) . '&nbsp;';
——@@ -382,11 +382,10 @@
383383 foreach( $days as $d ) {
384384 $days[$i++] = wlDaysLink( $d, $page, $options );
385385 }
386 - $separator = wfMsgExt( 'pipe-separator' , 'escapenoentities' );
387386 return wfMsgExt('wlshowlast',
388387 array('parseinline', 'replaceafter'),
389 - implode( $separator, $hours ),
390 - implode( $separator, $days ),
 388+ implode(' | ', $hours),
 389+ implode(' | ', $days),
391390 wlDaysLink( 0, $page, $options ) );
392391 }
393392
Index: trunk/phase3/includes/specials/SpecialAllmessages.php
——@@ -45,8 +45,7 @@
4646 $wgOut->addScriptFile( 'allmessages.js' );
4747 if ( $ot == 'php' ) {
4848 $navText .= wfAllMessagesMakePhp( $messages );
49 - $wgOut->addHTML( 'PHP | <a href="' . $wgTitle->escapeLocalUrl( 'ot=html' ) . '">HTML</a>' .
50 - wfMsgExt( 'pipe-separator' , 'escapenoentities' ) .
 49+ $wgOut->addHTML( 'PHP | <a href="' . $wgTitle->escapeLocalUrl( 'ot=html' ) . '">HTML</a> | ' .
5150 '<a href="' . $wgTitle->escapeLocalUrl( 'ot=xml' ) . '">XML</a>' .
5251 '<pre>' . htmlspecialchars( $navText ) . '</pre>' );
5352 } else if ( $ot == 'xml' ) {
——@@ -54,9 +53,8 @@
5554 header( 'Content-type: text/xml' );
5655 echo wfAllMessagesMakeXml( $messages );
5756 } else {
58 - $wgOut->addHTML( '<a href="' . $wgTitle->escapeLocalUrl( 'ot=php' ) . '">PHP</a>' .
59 - wfMsgExt( 'pipe-separator' , 'escapenoentities' ) .
60 - 'HTML' . wfMsgExt( 'pipe-separator' , 'escapenoentities' ) . '<a href="' . $wgTitle->escapeLocalUrl( 'ot=xml' ) . '">XML</a>' );
 57+ $wgOut->addHTML( '<a href="' . $wgTitle->escapeLocalUrl( 'ot=php' ) . '">PHP</a> | ' .
 58+ 'HTML | <a href="' . $wgTitle->escapeLocalUrl( 'ot=xml' ) . '">XML</a>' );
6159 $wgOut->addWikiText( $navText );
6260 $wgOut->addHTML( wfAllMessagesMakeHTMLText( $messages ) );
6361 }
Index: trunk/phase3/includes/Skin.php
——@@ -913,15 +913,14 @@
914914 $diff = $wgRequest->getVal( 'diff' );
915915 $action = $wgRequest->getText( 'action' );
916916
917 - $separator = wfMsgExt( 'pipe-separator' , 'escapenoentities' );
918917 $s = $this->printableLink();
919918 $disclaimer = $this->disclaimerLink(); # may be empty
920919 if( $disclaimer ) {
921 - $s .= $separator . $disclaimer;
 920+ $s .= ' | ' . $disclaimer;
922921 }
923922 $privacy = $this->privacyLink(); # may be empty too
924923 if( $privacy ) {
925 - $s .= $separator . $privacy;
 924+ $s .= ' | ' . $privacy;
926925 }
927926
928927 if ( $wgOut->isArticleRelated() ) {
——@@ -931,12 +930,12 @@
932931 if( $image ) {
933932 $link = htmlspecialchars( $image->getURL() );
934933 $style = $this->getInternalLinkAttributes( $link, $name );
935 - $s .= $separator . "<a href=\"{$link}\"{$style}>{$name}</a>";
 934+ $s .= " | <a href=\"{$link}\"{$style}>{$name}</a>";
936935 }
937936 }
938937 }
939938 if ( 'history' == $action || isset( $diff ) || isset( $oldid ) ) {
940 - $s .= $separator . $this->makeKnownLinkObj( $wgTitle,
 939+ $s .= ' | ' . $this->makeKnownLinkObj( $wgTitle,
941940 wfMsg( 'currentrev' ) );
942941 }
943942
——@@ -946,7 +945,7 @@
947946 if( !$wgTitle->equals( $wgUser->getTalkPage() ) ) {
948947 $tl = $this->makeKnownLinkObj( $wgUser->getTalkPage(), wfMsgHtml( 'newmessageslink' ), 'redirect=no' );
949948 $dl = $this->makeKnownLinkObj( $wgUser->getTalkPage(), wfMsgHtml( 'newmessagesdifflink' ), 'diff=cur' );
950 - $s.= $separator . '<strong>'. wfMsg( 'youhavenewmessages', $tl, $dl ) . '</strong>';
 949+ $s.= ' | <strong>'. wfMsg( 'youhavenewmessages', $tl, $dl ) . '</strong>';
951950 # disable caching
952951 $wgOut->setSquidMaxage(0);
953952 $wgOut->enableClientCache(false);
——@@ -955,7 +954,7 @@
956955
957956 $undelete = $this->getUndeleteLink();
958957 if( !empty( $undelete ) ) {
959 - $s .= $separator . $undelete;
 958+ $s .= ' | '.$undelete;
960959 }
961960 return $s;
962961 }
——@@ -988,7 +987,7 @@
989988 if( $wgOut->isSyndicated() ) {
990989 foreach( $wgFeedClasses as $format => $class ) {
991990 $feedurl = $wgRequest->escapeAppendQuery( "feed=$format" );
992 - $s .= wfMsgExt( 'pipe-separator' , 'escapenoentities' ) . "<a href=\"$feedurl\">{$format}</a>";
 991+ $s .= " | <a href=\"$feedurl\">{$format}</a>";
993992 }
994993 }
995994 return $s;
——@@ -1036,7 +1035,7 @@
10371036 $getlink = $this->makeKnownLinkObj( $linkObj, htmlspecialchars( $display ) );
10381037 $c++;
10391038 if ($c>1) {
1040 - $subpages .= wfMsgExt( 'pipe-separator' , 'escapenoentities' );
 1039+ $subpages .= ' | ';
10411040 } else {
10421041 $subpages .= '&lt; ';
10431042 }
——@@ -1103,9 +1102,9 @@
11041103 SpecialPage::getTitleFor( 'Userlogout' ), wfMsg( 'logout' ),
11051104 array(), array( 'returnto' => $returnTo )
11061105 );
1107 - $ret .= wfMsgExt( 'pipe-separator' , 'escapenoentities' ) . $this->specialLink( 'preferences' );
 1106+ $ret .= ' | ' . $this->specialLink( 'preferences' );
11081107 }
1109 - $ret .= wfMsgExt( 'pipe-separator' , 'escapenoentities' ) . $this->link(
 1108+ $ret .= ' | ' . $this->link(
11101109 Title::newFromText( wfMsgForContent( 'helppage' ) ),
11111110 wfMsg( 'help' )
11121111 );
——@@ -1171,7 +1170,7 @@
11721171 $s = '';
11731172 wfRunHooks( 'SkinTemplateTabs', array( $this, &$tabs ) );
11741173 foreach( $tabs as $tab ) {
1175 - $s .= wfMsgExt( 'pipe-separator' , 'escapenoentities' ) . Xml::element( 'a',
 1174+ $s .= ' | ' . Xml::element( 'a',
11761175 array( 'href' => $tab['href'] ),
11771176 $tab['text'] );
11781177 }
——@@ -1192,7 +1191,7 @@
11931192 $varname = $wgContLang->getVariantname( $code );
11941193 if( $varname == 'disable' )
11951194 continue;
1196 - $s .= wfMsgExt( 'pipe-separator' , 'escapenoentities' ) . '<a href="' . $wgTitle->escapeLocalUrl( 'variant=' . $code ) . '">' . htmlspecialchars( $varname ) . '</a>';
 1195+ $s .= ' | <a href="' . $wgTitle->escapeLocalUrl( 'variant=' . $code ) . '">' . htmlspecialchars( $varname ) . '</a>';
11971196 }
11981197 }
11991198 return $s;
——@@ -1623,7 +1622,7 @@
16241623 $first = true;
16251624 if($wgContLang->isRTL()) $s .= '<span dir="LTR">';
16261625 foreach( $a as $l ) {
1627 - if ( ! $first ) { $s .= wfMsgExt( 'pipe-separator' , 'escapenoentities' ); }
 1626+ if ( ! $first ) { $s .= ' | '; }
16281627 $first = false;
16291628
16301629 $nt = Title::newFromText( $l );
Index: trunk/phase3/includes/Linker.php
——@@ -1062,7 +1062,7 @@
10631063 }
10641064
10651065 if( $items ) {
1066 - return ' (' . implode( wfMsgExt( 'pipe-separator' , 'escapenoentities' ), $items ) . ')';
 1066+ return ' (' . implode( ' | ', $items ) . ')';
10671067 } else {
10681068 return '';
10691069 }
Index: trunk/phase3/includes/GlobalFunctions.php
——@@ -926,12 +926,10 @@
927927 } else {
928928 $nlink = '<a href="' . $title->escapeLocalUrl( $q ) . "\" class=\"mw-nextlink\">{$next}</a>";
929929 }
930 -
931 - $separator = wfMsgExt( 'pipe-separator' , 'escapenoentities' );
932 - $nums = wfNumLink( $offset, 20, $title, $query ) . $separator .
933 - wfNumLink( $offset, 50, $title, $query ) . $separator .
934 - wfNumLink( $offset, 100, $title, $query ) . $separator .
935 - wfNumLink( $offset, 250, $title, $query ) . $separator .
 930+ $nums = wfNumLink( $offset, 20, $title, $query ) . ' | ' .
 931+ wfNumLink( $offset, 50, $title, $query ) . ' | ' .
 932+ wfNumLink( $offset, 100, $title, $query ) . ' | ' .
 933+ wfNumLink( $offset, 250, $title, $query ) . ' | ' .
936934 wfNumLink( $offset, 500, $title, $query );
937935
938936 return wfMsg( 'viewprevnext', $plink, $nlink, $nums );
Index: trunk/phase3/includes/Pager.php
——@@ -513,8 +513,7 @@
514514
515515 $pagingLinks = $this->getPagingLinks( $linkTexts );
516516 $limitLinks = $this->getLimitLinks();
517 - $separator = wfMsgExt( 'pipe-separator' , 'escapenoentities' );
518 - $limits = implode( $separator, $limitLinks );
 517+ $limits = implode( ' | ', $limitLinks );
519518
520519 $this->mNavigationBar =
521520 "({$pagingLinks['first']} | {$pagingLinks['last']}) " .
——@@ -533,7 +532,7 @@
534533 if( $first ) {
535534 $first = false;
536535 } else {
537 - $extra .= $separator;
 536+ $extra .= ' | ';
538537 }
539538
540539 if( $order == $this->mOrderType ) {
——@@ -592,12 +591,11 @@
593592 'last' => wfMsgHtml( 'histfirst' )
594593 );
595594
596 - $separator = wfMsgExt( 'pipe-separator' , 'escapenoentities' );
597595 $pagingLinks = $this->getPagingLinks( $linkTexts );
598596 $limitLinks = $this->getLimitLinks();
599 - $limits = implode( $separator, $limitLinks );
 597+ $limits = implode( ' | ', $limitLinks );
600598
601 - $this->mNavigationBar = "({$pagingLinks['first']}" . $separator . "{$pagingLinks['last']}) " .
 599+ $this->mNavigationBar = "({$pagingLinks['first']} | {$pagingLinks['last']}) " .
602600 wfMsgHtml("viewprevnext", $pagingLinks['prev'], $pagingLinks['next'], $limits);
603601 return $this->mNavigationBar;
604602 }
Index: trunk/phase3/maintenance/language/messages.inc
——@@ -2549,7 +2549,6 @@
25502550 'comma-separator',
25512551 'colon-separator',
25522552 'autocomment-prefix',
2553 - 'pipe-separator',
25542553 ),
25552554 'imgmulti' => array(
25562555 'imgmultipageprev',
Index: trunk/phase3/maintenance/language/messageTypes.inc
——@@ -314,7 +314,6 @@
315315 'comma-separator',
316316 'colon-separator',
317317 'autocomment-prefix',
318 - 'pipe-separator',
319318 'listgrouprights-right-display',
320319 'timezone-utc',
321320 'whatlinkshere-backlink',

Follow-up revisions

RevisionCommit summaryAuthorDate
r47046(bug 7509) Separation strings should be configurable...siebrand17:48, 9 February 2009

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r16824(bug 7509) Make back arrow in Special:Whatlinkshere editable through Mediawik...collinj23:13, 6 October 2006
r40953(bug 7509) Don't hardcode separation strings, make them configurable...siebrand09:41, 17 September 2008