From 37dded29d18a7c170cdc699c9c21da1e77eab242 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Thu, 18 Sep 2008 17:11:51 +0000 Subject: [PATCH] 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. --- includes/GlobalFunctions.php | 10 ++++---- includes/Linker.php | 2 +- includes/PageHistory.php | 2 +- includes/Pager.php | 10 ++++---- includes/Skin.php | 27 +++++++++++----------- includes/WatchlistEditor.php | 4 ++-- includes/specials/SpecialAllmessages.php | 8 +++---- includes/specials/SpecialAllpages.php | 8 +++---- includes/specials/SpecialBlockip.php | 2 +- includes/specials/SpecialContributions.php | 2 +- includes/specials/SpecialNewpages.php | 2 +- includes/specials/SpecialPreferences.php | 2 +- includes/specials/SpecialPrefixindex.php | 2 +- includes/specials/SpecialRecentchanges.php | 8 +++---- includes/specials/SpecialUserlogin.php | 2 +- includes/specials/SpecialWatchlist.php | 7 +++--- includes/specials/SpecialWhatlinkshere.php | 4 ++-- languages/messages/MessagesEn.php | 1 - maintenance/language/messageTypes.inc | 1 - maintenance/language/messages.inc | 1 - skins/CologneBlue.php | 20 ++++++++-------- skins/Standard.php | 8 +++---- 22 files changed, 59 insertions(+), 74 deletions(-) diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php index c43a133a81..44d35120da 100644 --- a/includes/GlobalFunctions.php +++ b/includes/GlobalFunctions.php @@ -926,12 +926,10 @@ function wfViewPrevNext( $offset, $limit, $link, $query = '', $atend = false ) { } else { $nlink = '{$next}"; } - - $separator = wfMsgExt( 'pipe-separator' , 'escapenoentities' ); - $nums = wfNumLink( $offset, 20, $title, $query ) . $separator . - wfNumLink( $offset, 50, $title, $query ) . $separator . - wfNumLink( $offset, 100, $title, $query ) . $separator . - wfNumLink( $offset, 250, $title, $query ) . $separator . + $nums = 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 ); return wfMsg( 'viewprevnext', $plink, $nlink, $nums ); diff --git a/includes/Linker.php b/includes/Linker.php index cd34d33f33..54f5633dad 100644 --- a/includes/Linker.php +++ b/includes/Linker.php @@ -1062,7 +1062,7 @@ class Linker { } if( $items ) { - return ' (' . implode( wfMsgExt( 'pipe-separator' , 'escapenoentities' ), $items ) . ')'; + return ' (' . implode( ' | ', $items ) . ')'; } else { return ''; } diff --git a/includes/PageHistory.php b/includes/PageHistory.php index 79e5464d5a..4ba67a289b 100644 --- a/includes/PageHistory.php +++ b/includes/PageHistory.php @@ -379,7 +379,7 @@ class PageHistory { } if( $tools ) { - $s .= ' (' . implode( wfMsgExt( 'pipe-separator' , 'escapenoentities' ), $tools ) . ')'; + $s .= ' (' . implode( ' | ', $tools ) . ')'; } wfRunHooks( 'PageHistoryLineEnding', array( $this, &$row , &$s ) ); diff --git a/includes/Pager.php b/includes/Pager.php index 251082589a..3125610754 100644 --- a/includes/Pager.php +++ b/includes/Pager.php @@ -513,8 +513,7 @@ abstract class AlphabeticPager extends IndexPager { $pagingLinks = $this->getPagingLinks( $linkTexts ); $limitLinks = $this->getLimitLinks(); - $separator = wfMsgExt( 'pipe-separator' , 'escapenoentities' ); - $limits = implode( $separator, $limitLinks ); + $limits = implode( ' | ', $limitLinks ); $this->mNavigationBar = "({$pagingLinks['first']} | {$pagingLinks['last']}) " . @@ -533,7 +532,7 @@ abstract class AlphabeticPager extends IndexPager { if( $first ) { $first = false; } else { - $extra .= $separator; + $extra .= ' | '; } if( $order == $this->mOrderType ) { @@ -592,12 +591,11 @@ abstract class ReverseChronologicalPager extends IndexPager { 'last' => wfMsgHtml( 'histfirst' ) ); - $separator = wfMsgExt( 'pipe-separator' , 'escapenoentities' ); $pagingLinks = $this->getPagingLinks( $linkTexts ); $limitLinks = $this->getLimitLinks(); - $limits = implode( $separator, $limitLinks ); + $limits = implode( ' | ', $limitLinks ); - $this->mNavigationBar = "({$pagingLinks['first']}" . $separator . "{$pagingLinks['last']}) " . + $this->mNavigationBar = "({$pagingLinks['first']} | {$pagingLinks['last']}) " . wfMsgHtml("viewprevnext", $pagingLinks['prev'], $pagingLinks['next'], $limits); return $this->mNavigationBar; } diff --git a/includes/Skin.php b/includes/Skin.php index f725489fab..f6ba839b3d 100644 --- a/includes/Skin.php +++ b/includes/Skin.php @@ -913,15 +913,14 @@ END; $diff = $wgRequest->getVal( 'diff' ); $action = $wgRequest->getText( 'action' ); - $separator = wfMsgExt( 'pipe-separator' , 'escapenoentities' ); $s = $this->printableLink(); $disclaimer = $this->disclaimerLink(); # may be empty if( $disclaimer ) { - $s .= $separator . $disclaimer; + $s .= ' | ' . $disclaimer; } $privacy = $this->privacyLink(); # may be empty too if( $privacy ) { - $s .= $separator . $privacy; + $s .= ' | ' . $privacy; } if ( $wgOut->isArticleRelated() ) { @@ -931,12 +930,12 @@ END; if( $image ) { $link = htmlspecialchars( $image->getURL() ); $style = $this->getInternalLinkAttributes( $link, $name ); - $s .= $separator . "{$name}"; + $s .= " | {$name}"; } } } if ( 'history' == $action || isset( $diff ) || isset( $oldid ) ) { - $s .= $separator . $this->makeKnownLinkObj( $wgTitle, + $s .= ' | ' . $this->makeKnownLinkObj( $wgTitle, wfMsg( 'currentrev' ) ); } @@ -946,7 +945,7 @@ END; if( !$wgTitle->equals( $wgUser->getTalkPage() ) ) { $tl = $this->makeKnownLinkObj( $wgUser->getTalkPage(), wfMsgHtml( 'newmessageslink' ), 'redirect=no' ); $dl = $this->makeKnownLinkObj( $wgUser->getTalkPage(), wfMsgHtml( 'newmessagesdifflink' ), 'diff=cur' ); - $s.= $separator . ''. wfMsg( 'youhavenewmessages', $tl, $dl ) . ''; + $s.= ' | '. wfMsg( 'youhavenewmessages', $tl, $dl ) . ''; # disable caching $wgOut->setSquidMaxage(0); $wgOut->enableClientCache(false); @@ -955,7 +954,7 @@ END; $undelete = $this->getUndeleteLink(); if( !empty( $undelete ) ) { - $s .= $separator . $undelete; + $s .= ' | '.$undelete; } return $s; } @@ -988,7 +987,7 @@ END; if( $wgOut->isSyndicated() ) { foreach( $wgFeedClasses as $format => $class ) { $feedurl = $wgRequest->escapeAppendQuery( "feed=$format" ); - $s .= wfMsgExt( 'pipe-separator' , 'escapenoentities' ) . "{$format}"; + $s .= " | {$format}"; } } return $s; @@ -1036,7 +1035,7 @@ END; $getlink = $this->makeKnownLinkObj( $linkObj, htmlspecialchars( $display ) ); $c++; if ($c>1) { - $subpages .= wfMsgExt( 'pipe-separator' , 'escapenoentities' ); + $subpages .= ' | '; } else { $subpages .= '< '; } @@ -1103,9 +1102,9 @@ END; SpecialPage::getTitleFor( 'Userlogout' ), wfMsg( 'logout' ), array(), array( 'returnto' => $returnTo ) ); - $ret .= wfMsgExt( 'pipe-separator' , 'escapenoentities' ) . $this->specialLink( 'preferences' ); + $ret .= ' | ' . $this->specialLink( 'preferences' ); } - $ret .= wfMsgExt( 'pipe-separator' , 'escapenoentities' ) . $this->link( + $ret .= ' | ' . $this->link( Title::newFromText( wfMsgForContent( 'helppage' ) ), wfMsg( 'help' ) ); @@ -1171,7 +1170,7 @@ END; $s = ''; wfRunHooks( 'SkinTemplateTabs', array( $this, &$tabs ) ); foreach( $tabs as $tab ) { - $s .= wfMsgExt( 'pipe-separator' , 'escapenoentities' ) . Xml::element( 'a', + $s .= ' | ' . Xml::element( 'a', array( 'href' => $tab['href'] ), $tab['text'] ); } @@ -1192,7 +1191,7 @@ END; $varname = $wgContLang->getVariantname( $code ); if( $varname == 'disable' ) continue; - $s .= wfMsgExt( 'pipe-separator' , 'escapenoentities' ) . '' . htmlspecialchars( $varname ) . ''; + $s .= ' | ' . htmlspecialchars( $varname ) . ''; } } return $s; @@ -1623,7 +1622,7 @@ END; $first = true; if($wgContLang->isRTL()) $s .= ''; foreach( $a as $l ) { - if ( ! $first ) { $s .= wfMsgExt( 'pipe-separator' , 'escapenoentities' ); } + if ( ! $first ) { $s .= ' | '; } $first = false; $nt = Title::newFromText( $l ); diff --git a/includes/WatchlistEditor.php b/includes/WatchlistEditor.php index faaa8b93ed..fcfdb78294 100644 --- a/includes/WatchlistEditor.php +++ b/includes/WatchlistEditor.php @@ -391,7 +391,7 @@ class WatchlistEditor { } return '
  • ' . Xml::check( 'titles[]', false, array( 'value' => $title->getPrefixedText() ) ) - . $link . ' (' . implode( wfMsgExt( 'pipe-separator' , 'escapenoentities' ), $tools ) . ')' . '
    • '; + . $link . ' (' . implode( ' | ', $tools ) . ')' . ''; } /** @@ -457,6 +457,6 @@ class WatchlistEditor { foreach( $modes as $mode => $subpage ) { $tools[] = $skin->makeKnownLinkObj( SpecialPage::getTitleFor( 'Watchlist', $subpage ), wfMsgHtml( "watchlisttools-{$mode}" ) ); } - return implode( wfMsgExt( 'pipe-separator' , 'escapenoentities' ), $tools ); + return implode( ' | ', $tools ); } } diff --git a/includes/specials/SpecialAllmessages.php b/includes/specials/SpecialAllmessages.php index c4bc313fcf..c2a8de4ef0 100644 --- a/includes/specials/SpecialAllmessages.php +++ b/includes/specials/SpecialAllmessages.php @@ -45,8 +45,7 @@ function wfSpecialAllmessages() { $wgOut->addScriptFile( 'allmessages.js' ); if ( $ot == 'php' ) { $navText .= wfAllMessagesMakePhp( $messages ); - $wgOut->addHTML( 'PHP | HTML' . - wfMsgExt( 'pipe-separator' , 'escapenoentities' ) . + $wgOut->addHTML( 'PHP | HTML | ' . 'XML' . '
    ' . htmlspecialchars( $navText ) . '
    ' ); } else if ( $ot == 'xml' ) { @@ -54,9 +53,8 @@ function wfSpecialAllmessages() { header( 'Content-type: text/xml' ); echo wfAllMessagesMakeXml( $messages ); } else { - $wgOut->addHTML( 'PHP' . - wfMsgExt( 'pipe-separator' , 'escapenoentities' ) . - 'HTML' . wfMsgExt( 'pipe-separator' , 'escapenoentities' ) . 'XML' ); + $wgOut->addHTML( 'PHP | ' . + 'HTML | XML' ); $wgOut->addWikiText( $navText ); $wgOut->addHTML( wfAllMessagesMakeHTMLText( $messages ) ); } diff --git a/includes/specials/SpecialAllpages.php b/includes/specials/SpecialAllpages.php index afe6738a59..f27c12005f 100644 --- a/includes/specials/SpecialAllpages.php +++ b/includes/specials/SpecialAllpages.php @@ -328,8 +328,6 @@ class SpecialAllpages extends IncludableSpecialPage { } } - $separator = wfMsgExt( 'pipe-separator' , 'escapenoentities' ); - if ( $this->including() ) { $out2 = ''; } else { @@ -384,7 +382,7 @@ class SpecialAllpages extends IncludableSpecialPage { . ( $namespace ? '&namespace=' . $namespace : '' ); $prevLink = $sk->makeKnownLinkObj( $self, wfMsgHTML( 'prevpage', htmlspecialchars( $pt ) ), $q ); - $out2 .= $separator . $prevLink; + $out2 .= ' | ' . $prevLink; } if( $n == $this->maxPerPage && $s = $res->fetchObject() ) { @@ -394,7 +392,7 @@ class SpecialAllpages extends IncludableSpecialPage { . ( $namespace ? '&namespace=' . $namespace : '' ); $nextLink = $sk->makeKnownLinkObj( $self, wfMsgHtml( 'nextpage', htmlspecialchars( $t->getText() ) ), $q ); - $out2 .= $separator . $nextLink; + $out2 .= ' | ' . $nextLink; } $out2 .= "
    "; } @@ -406,7 +404,7 @@ class SpecialAllpages extends IncludableSpecialPage { $wgOut->addHTML( $prevLink ); } if( isset( $prevLink ) && isset( $nextLink ) ) { - $wgOut->addHTML( $separator ); + $wgOut->addHTML( ' | ' ); } if( isset( $nextLink ) ) { $wgOut->addHTML( $nextLink ); diff --git a/includes/specials/SpecialBlockip.php b/includes/specials/SpecialBlockip.php index e6931cb9d0..2157f2345e 100644 --- a/includes/specials/SpecialBlockip.php +++ b/includes/specials/SpecialBlockip.php @@ -463,7 +463,7 @@ class IPBlockForm { $links[] = $skin->makeLink ( 'MediaWiki:Ipbreason-dropdown', wfMsgHtml( 'ipb-edit-dropdown' ) ); $links[] = $this->getUnblockLink( $skin ); $links[] = $this->getBlockListLink( $skin ); - return '

    ' . implode( wfMsgExt( 'pipe-separator' , 'escapenoentities' ), $links ) . '

    '; + return '

    ' . implode( ' | ', $links ) . '

    '; } /** diff --git a/includes/specials/SpecialContributions.php b/includes/specials/SpecialContributions.php index f1ce6fd9eb..694690dc2a 100644 --- a/includes/specials/SpecialContributions.php +++ b/includes/specials/SpecialContributions.php @@ -338,7 +338,7 @@ function contributionsSub( $nt, $id ) { wfRunHooks( 'ContributionsToolLinks', array( $id, $nt, &$tools ) ); - $links = implode( wfMsgExt( 'pipe-separator' , 'escapenoentities' ), $tools ); + $links = implode( ' | ', $tools ); } // Old message 'contribsub' had one parameter, but that doesn't work for diff --git a/includes/specials/SpecialNewpages.php b/includes/specials/SpecialNewpages.php index e65ca96ab7..8612246083 100644 --- a/includes/specials/SpecialNewpages.php +++ b/includes/specials/SpecialNewpages.php @@ -148,7 +148,7 @@ class SpecialNewpages extends SpecialPage { $links[$key] = wfMsgHtml( $msg, $link ); } - return implode( wfMsgExt( 'pipe-separator' , 'escapenoentities' ), $links ); + return implode( ' | ', $links ); } protected function form() { diff --git a/includes/specials/SpecialPreferences.php b/includes/specials/SpecialPreferences.php index 352311309f..03f94ab82f 100644 --- a/includes/specials/SpecialPreferences.php +++ b/includes/specials/SpecialPreferences.php @@ -634,7 +634,7 @@ class PreferencesForm { $this->tableRow( wfMsgExt( 'prefs-memberingroups', array( 'parseinline' ), count( $userEffectiveGroupsArray ) ), implode( wfMsg( 'comma-separator' ), $userEffectiveGroupsArray ) . - '
    (' . implode( wfMsgExt( 'pipe-separator' , 'escapenoentities' ), $toolLinks ) . ')' + '
    (' . implode( ' | ', $toolLinks ) . ')' ) . $this->tableRow( diff --git a/includes/specials/SpecialPrefixindex.php b/includes/specials/SpecialPrefixindex.php index c2168c56db..a360d509b2 100644 --- a/includes/specials/SpecialPrefixindex.php +++ b/includes/specials/SpecialPrefixindex.php @@ -175,7 +175,7 @@ class SpecialPrefixindex extends SpecialAllpages { wfMsg ( 'allpages' ) ); if( isset( $res ) && $res && ( $n == $this->maxPerPage ) && ( $s = $res->fetchObject() ) ) { $namespaceparam = $namespace ? "&namespace=$namespace" : ""; - $out2 .= wfMsgExt( 'pipe-separator' , 'escapenoentities' ) . $sk->makeKnownLinkObj( + $out2 .= " | " . $sk->makeKnownLinkObj( $self, wfMsgHtml( 'nextpage', htmlspecialchars( $s->page_title ) ), "from=" . wfUrlEncode( $s->page_title ) . diff --git a/includes/specials/SpecialRecentchanges.php b/includes/specials/SpecialRecentchanges.php index 7eaed2659c..0fe134580f 100644 --- a/includes/specials/SpecialRecentchanges.php +++ b/includes/specials/SpecialRecentchanges.php @@ -618,16 +618,14 @@ class SpecialRecentChanges extends SpecialPage { $cl[] = $this->makeOptionsLink( $wgLang->formatNum( $value ), array( 'limit' => $value ), $nondefaults, $value == $options['limit'] ) ; } - - $separator = wfMsgExt( 'pipe-separator' , 'escapenoentities' ); - $cl = implode( $separator, $cl ); + $cl = implode( ' | ', $cl ); // day links, reset 'from' to none foreach( $wgRCLinkDays as $value ) { $dl[] = $this->makeOptionsLink( $wgLang->formatNum( $value ), array( 'days' => $value, 'from' => '' ), $nondefaults, $value == $options['days'] ) ; } - $dl = implode( $separator, $dl ); + $dl = implode( ' | ', $dl ); // show/hide links @@ -652,7 +650,7 @@ class SpecialRecentChanges extends SpecialPage { if( $wgUser->useRCPatrol() ) $links[] = wfMsgHtml( 'rcshowhidepatr', $patrLink ); $links[] = wfMsgHtml( 'rcshowhidemine', $myselfLink ); - $hl = implode( $separator, $links ); + $hl = implode( ' | ', $links ); // show from this onward link $now = $wgLang->timeanddate( wfTimestampNow(), true ); diff --git a/includes/specials/SpecialUserlogin.php b/includes/specials/SpecialUserlogin.php index 97e7fd4a34..b6908c94f2 100644 --- a/includes/specials/SpecialUserlogin.php +++ b/includes/specials/SpecialUserlogin.php @@ -970,7 +970,7 @@ class LoginForm { $links[] = $this->makeLanguageSelectorLink( $parts[0], $parts[1] ); } } - return count( $links ) > 0 ? wfMsgHtml( 'loginlanguagelabel', implode( wfMsgExt( 'pipe-separator' , 'escapenoentities' ), $links ) ) : ''; + return count( $links ) > 0 ? wfMsgHtml( 'loginlanguagelabel', implode( ' | ', $links ) ) : ''; } else { return ''; } diff --git a/includes/specials/SpecialWatchlist.php b/includes/specials/SpecialWatchlist.php index f12ab973df..ccdc722977 100644 --- a/includes/specials/SpecialWatchlist.php +++ b/includes/specials/SpecialWatchlist.php @@ -271,7 +271,7 @@ function wfSpecialWatchlist( $par ) { # Namespace filter and put the whole form together. $form .= $wlInfo; $form .= $cutofflinks; - $form .= implode( wfMsgExt( 'pipe-separator' , 'escapenoentities' ), $links ); + $form .= implode( ' | ', $links ); $form .= Xml::openElement( 'form', array( 'method' => 'post', 'action' => $thisTitle->getLocalUrl() ) ); $form .= '

    '; $form .= Xml::label( wfMsg( 'namespace' ), 'namespace' ) . ' '; @@ -382,11 +382,10 @@ function wlCutoffLinks( $days, $page = 'Watchlist', $options = array() ) { foreach( $days as $d ) { $days[$i++] = wlDaysLink( $d, $page, $options ); } - $separator = wfMsgExt( 'pipe-separator' , 'escapenoentities' ); return wfMsgExt('wlshowlast', array('parseinline', 'replaceafter'), - implode( $separator, $hours ), - implode( $separator, $days ), + implode(' | ', $hours), + implode(' | ', $days), wlDaysLink( 0, $page, $options ) ); } diff --git a/includes/specials/SpecialWhatlinkshere.php b/includes/specials/SpecialWhatlinkshere.php index d3fa691dec..ade28f19a1 100644 --- a/includes/specials/SpecialWhatlinkshere.php +++ b/includes/specials/SpecialWhatlinkshere.php @@ -340,7 +340,7 @@ class WhatLinksHerePage { $limitLinks[] = $this->makeSelfLink( $prettyLimit, wfArrayToCGI( $overrides, $changed ) ); } - $nums = implode ( wfMsgExt( 'pipe-separator' , 'escapenoentities' ), $limitLinks ); + $nums = implode ( ' | ', $limitLinks ); return wfMsgHtml( 'viewprevnext', $prev, $next, $nums ); } @@ -403,6 +403,6 @@ class WhatLinksHerePage { $overrides = array( $type => !$chosen ); $links[] = $this->makeSelfLink( $msg, wfArrayToCGI( $overrides, $changed ) ); } - return Xml::fieldset( wfMsg( 'whatlinkshere-filters' ), implode( wfMsgExt( 'pipe-separator' , 'escapenoentities' ), $links ) ); + return Xml::fieldset( wfMsg( 'whatlinkshere-filters' ), implode( ' | ', $links ) ); } } diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index 97c3976506..27d80ffad9 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -3416,7 +3416,6 @@ $1', 'comma-separator' => ', ', # only translate this message to other languages if you have to change it 'colon-separator' => ': ', # only translate this message to other languages if you have to change it 'autocomment-prefix' => '- ', # only translate this message to other languages if you have to change it -'pipe-separator' => ' | ', # only translate this message to other languages if you have to change it # Multipage image navigation 'imgmultipageprev' => '← previous page', diff --git a/maintenance/language/messageTypes.inc b/maintenance/language/messageTypes.inc index ed67aab13c..98d3d8f66d 100644 --- a/maintenance/language/messageTypes.inc +++ b/maintenance/language/messageTypes.inc @@ -314,7 +314,6 @@ $wgOptionalMessages = array( 'comma-separator', 'colon-separator', 'autocomment-prefix', - 'pipe-separator', 'listgrouprights-right-display', 'timezone-utc', 'whatlinkshere-backlink', diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc index 2c28b448d9..3ba87df017 100644 --- a/maintenance/language/messages.inc +++ b/maintenance/language/messages.inc @@ -2549,7 +2549,6 @@ $wgMessageStructure = array( 'comma-separator', 'colon-separator', 'autocomment-prefix', - 'pipe-separator', ), 'imgmulti' => array( 'imgmultipageprev', diff --git a/skins/CologneBlue.php b/skins/CologneBlue.php index d2a681c2c5..797396223e 100644 --- a/skins/CologneBlue.php +++ b/skins/CologneBlue.php @@ -79,10 +79,9 @@ class SkinCologneBlue extends Skin { } $s .= ""; - $separator = wfMsgExt( 'pipe-separator' , 'escapenoentities' ); $s .= $this->bottomLinks(); - $s .= "\n
    " . $this->makeKnownLinkObj( Title::newMainPage() ) . $separator - . $this->aboutLink() . $separator + $s .= "\n
    " . $this->makeKnownLinkObj( Title::newMainPage() ) . " | " + . $this->aboutLink() . " | " . $this->searchForm( wfMsg( "qbfind" ) ); $s .= "\n
    " . $this->pageStats(); @@ -133,19 +132,22 @@ class SkinCologneBlue extends Skin { $q = "returnto={$rt}"; } - $separator = wfMsgExt( 'pipe-separator' , 'escapenoentities' ); $s = "" . - $this->mainPageLink(). $separator . - $this->makeKnownLink( wfMsgForContent( "aboutpage" ), wfMsg( "about" ) ) . $separator . - $this->makeKnownLink( wfMsgForContent( "helppage" ), wfMsg( "help" ) ) . $separator . - $this->makeKnownLink( wfMsgForContent( "faqpage" ), wfMsg("faq") ) . $separator . + $this->mainPageLink() + . " | " . + $this->makeKnownLink( wfMsgForContent( "aboutpage" ), wfMsg( "about" ) ) + . " | " . + $this->makeKnownLink( wfMsgForContent( "helppage" ), wfMsg( "help" ) ) + . " | " . + $this->makeKnownLink( wfMsgForContent( "faqpage" ), wfMsg("faq") ) + . " | " . $this->specialLink( "specialpages" ); /* show links to different language variants */ $s .= $this->variantLinks(); $s .= $this->extensionTabLinks(); - $s .= $separator; + $s .= " | "; if ( $wgUser->isLoggedIn() ) { $s .= $this->makeKnownLink( $lo, wfMsg( "logout" ), $q ); } else { diff --git a/skins/Standard.php b/skins/Standard.php index f8703900e6..9b65de718e 100644 --- a/skins/Standard.php +++ b/skins/Standard.php @@ -107,13 +107,11 @@ class SkinStandard extends Skin { $l = $wgContLang->isRTL() ? 'right' : 'left'; $s .= ""; - $separator = wfMsgExt( 'pipe-separator' , 'escapenoentities' ); - $s .= $this->bottomLinks(); $s .= "\n
    " . $this->mainPageLink() - . $separator . $this->aboutLink() - . $separator . $this->specialLink( 'recentchanges' ) - . $separator . $this->searchForm() + . ' | ' . $this->aboutLink() + . ' | ' . $this->specialLink( 'recentchanges' ) + . ' | ' . $this->searchForm() . '
    ' . $this->pageStats() . ''; $s .= ""; -- 2.20.1