";
- $s .= "\n" . $this->logoText() . "\n
";
+ $s .= "\n" . $this->getSkin()->logoText() . "\n
";
$sep = "\n
";
# Use the first heading from the Monobook sidebar as the "browse" section
- $bar = $this->buildSidebar();
+ $bar = $this->getSkin()->buildSidebar();
unset( $bar['SEARCH'] );
unset( $bar['LANGUAGES'] );
unset( $bar['TOOLBOX'] );
- $browseLinks = reset( $bar );
- foreach ( $browseLinks as $link ) {
- if ( $link['text'] != '-' ) {
- $s .= "
" .
- htmlspecialchars( $link['text'] ) . '' . $sep;
+ $barnumber = 1;
+ foreach ( $bar as $browseLinks ) {
+ if ( $barnumber > 1 ) {
+ $s .= "\n
";
+ }
+ foreach ( $browseLinks as $link ) {
+ if ( $link['text'] != '-' ) {
+ $s .= "
" .
+ htmlspecialchars( $link['text'] ) . '' . $sep;
+ }
}
+ if ( $barnumber == 1 ) {
+ // only show watchlist link if logged in
+ if( $wgUser->isLoggedIn() ) {
+ $s.= Linker::specialLink( 'Watchlist' ) ;
+ $s .= $sep . Linker::linkKnown(
+ SpecialPage::getTitleFor( 'Contributions' ),
+ wfMsg( 'mycontris' ),
+ array(),
+ array( 'target' => $wgUser->getName() )
+ );
+ }
+ }
+ $barnumber = $barnumber + 1;
}
- if( $wgUser->isLoggedIn() ) {
- $s.= $this->specialLink( 'watchlist' ) ;
- $s .= $sep . $this->makeKnownLink( $wgContLang->specialPage( 'Contributions' ),
- wfMsg( 'mycontris' ), 'target=' . wfUrlencode($wgUser->getName() ) );
- }
- // only show watchlist link if logged in
$s .= "\n
";
- $articleExists = $wgTitle->getArticleId();
- if ( $wgOut->isArticle() || $action =='edit' || $action =='history' || $wpPreview) {
- if($wgOut->isArticle()) {
+ $articleExists = $title->getArticleId();
+ if ( $wgOut->isArticle() || $action == 'edit' || $action == 'history' || $wpPreview ) {
+ if( $wgOut->isArticle() ) {
$s .= '
' . $this->editThisPage() . '';
} else { # backlink to the article in edit or history mode
- if($articleExists){ # no backlink if no article
- switch($tns) {
+ if( $articleExists ){ # no backlink if no article
+ switch( $tns ) {
case NS_TALK:
case NS_USER_TALK:
case NS_PROJECT_TALK:
@@ -207,30 +194,34 @@ class SkinStandard extends Skin {
$text = wfMsg( 'categorypage' );
break;
default:
- $text= wfMsg( 'articlepage' );
+ $text = wfMsg( 'articlepage' );
}
- $link = $wgTitle->getText();
- if ($nstext = $wgContLang->getNsText($tns) ) { # add namespace if necessary
- $link = $nstext . ':' . $link ;
+ $link = $title->getText();
+ $nstext = $wgContLang->getNsText( $tns );
+ if( $nstext ) { # add namespace if necessary
+ $link = $nstext . ':' . $link;
}
- $s .= $this->makeLink( $link, $text );
- } elseif( $wgTitle->getNamespace() != NS_SPECIAL ) {
+ $s .= Linker::link( Title::newFromText( $link ), $text );
+ } elseif( $title->getNamespace() != NS_SPECIAL ) {
# we just throw in a "New page" text to tell the user that he's in edit mode,
# and to avoid messing with the separator that is prepended to the next item
- $s .= '
' . wfMsg('newpage') . '';
+ $s .= '
' . wfMsg( 'newpage' ) . '';
}
-
}
# "Post a comment" link
- if( ( $wgTitle->isTalkPage() || $wgOut->showNewSectionLink() ) && $action != 'edit' && !$wpPreview )
- $s .= '
' . $this->makeKnownLinkObj( $wgTitle, wfMsg( 'postcomment' ), 'action=edit§ion=new' );
-
- #if( $tns%2 && $action!='edit' && !$wpPreview) {
- #$s.= '
'.$this->makeKnownLink($wgTitle->getPrefixedText(),wfMsg('postcomment'),'action=edit§ion=new');
- #}
+ if( ( $title->isTalkPage() || $wgOut->showNewSectionLink() ) && $action != 'edit' && !$wpPreview )
+ $s .= '
' . Linker::link(
+ $title,
+ wfMsg( 'postcomment' ),
+ array(),
+ array(
+ 'action' => 'edit',
+ 'section' => 'new'
+ )
+ );
/*
watching could cause problems in edit mode:
@@ -238,49 +229,50 @@ class SkinStandard extends Skin {
article with "Watch this article" checkbox disabled, the article is transparently
unwatched. Therefore we do not show the "Watch this page" link in edit mode
*/
- if ( $wgUser->isLoggedIn() && $articleExists) {
- if($action!='edit' && $action != 'submit' )
- {
+ if ( $wgUser->isLoggedIn() && $articleExists ) {
+ if( $action != 'edit' && $action != 'submit' ) {
$s .= $sep . $this->watchThisPage();
}
- if ( $wgTitle->userCan( 'edit' ) )
+ if ( $title->userCan( 'edit' ) )
$s .= $sep . $this->moveThisPage();
}
- if ( $wgUser->isAllowed('delete') and $articleExists ) {
+ if ( $wgUser->isAllowed( 'delete' ) && $articleExists ) {
$s .= $sep . $this->deleteThisPage() .
$sep . $this->protectThisPage();
}
$s .= $sep . $this->talkLink();
- if ($articleExists && $action !='history') {
+ if( $articleExists && $action != 'history' ) {
$s .= $sep . $this->historyLink();
}
- $s.=$sep . $this->whatLinksHere();
+ $s .= $sep . $this->whatLinksHere();
- if($wgOut->isArticleRelated()) {
+ if( $wgOut->isArticleRelated() ) {
$s .= $sep . $this->watchPageLinksLink();
}
- if ( NS_USER == $wgTitle->getNamespace()
- || $wgTitle->getNamespace() == NS_USER_TALK ) {
+ if (
+ NS_USER == $title->getNamespace() ||
+ $title->getNamespace() == NS_USER_TALK
+ ) {
- $id=User::idFromName($wgTitle->getText());
- $ip=User::isIP($wgTitle->getText());
+ $id = User::idFromName( $title->getText() );
+ $ip = User::isIP( $title->getText() );
if( $id || $ip ){
$s .= $sep . $this->userContribsLink();
}
- if( $this->showEmailUser( $id ) ) {
+ if( $this->getSkin()->showEmailUser( $id ) ) {
$s .= $sep . $this->emailUserLink();
}
}
$s .= "\n
";
}
- if ( $wgUser->isLoggedIn() && ( $wgEnableUploads || $wgRemoteUploads ) ) {
- $s .= $this->specialLink( 'upload' ) . $sep;
+ if( UploadBase::isEnabled() && UploadBase::isAllowed( $wgUser ) === true ) {
+ $s .= $this->getUploadLink() . $sep;
}
- $s .= $this->specialLink( 'specialpages' )
- . $sep . $this->bugReportsLink();
+
+ $s .= Linker::specialLink( 'Specialpages' );
global $wgSiteSupportPage;
if( $wgSiteSupportPage ) {
@@ -289,9 +281,8 @@ class SkinStandard extends Skin {
}
$s .= "\n