";
- $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 ( is_array( $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( $this->data['loggedin'] ) {
+ $s.= Linker::specialLink( 'Watchlist' ) ;
+ $s .= $sep . Linker::linkKnown(
+ SpecialPage::getTitleFor( 'Contributions' ),
+ wfMsg( 'mycontris' ),
+ array(),
+ array( 'target' => $this->data['username'] )
+ );
+ }
}
+ $barnumber = $barnumber + 1;
}
- if( $wgUser->isLoggedIn() ) {
- $s.= $this->specialLink( 'Watchlist' ) ;
- $s .= $sep . $this->linkKnown(
- SpecialPage::getTitleFor( 'Contributions' ),
- wfMsg( 'mycontris' ),
- array(),
- array( 'target' => $wgUser->getName() )
- );
- }
- // only show watchlist link if logged in
$s .= "\n
";
- $articleExists = $this->mTitle->getArticleId();
- if ( $wgOut->isArticle() || $action == 'edit' || $action == 'history' || $wpPreview ) {
- if( $wgOut->isArticle() ) {
+ $articleExists = $title->getArticleId();
+ if ( $this->data['isarticle'] || $action == 'edit' || $action == 'history' || $wpPreview ) {
+ if( $this->data['isarticle'] ) {
$s .= '
' . $this->editThisPage() . '';
} else { # backlink to the article in edit or history mode
if( $articleExists ){ # no backlink if no article
@@ -185,17 +188,14 @@ class SkinStandard extends Skin {
$text = wfMsg( 'articlepage' );
}
- $link = $this->mTitle->getText();
+ $link = $title->getText();
$nstext = $wgContLang->getNsText( $tns );
if( $nstext ) { # add namespace if necessary
$link = $nstext . ':' . $link;
}
- $s .= $this->link(
- Title::newFromText( $link ),
- $text
- );
- } elseif( $this->mTitle->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' ) . '';
@@ -203,32 +203,31 @@ class SkinStandard extends Skin {
}
# "Post a comment" link
- if( ( $this->mTitle->isTalkPage() || $wgOut->showNewSectionLink() ) && $action != 'edit' && !$wpPreview )
- $s .= '
' . $this->link(
- $this->mTitle,
+ if( ( $title->isTalkPage() || $this->getSkin()->getOutput()->showNewSectionLink() ) && $action != 'edit' && !$wpPreview )
+ $s .= '
' . Linker::link(
+ $title,
wfMsg( 'postcomment' ),
array(),
array(
'action' => 'edit',
'section' => 'new'
- ),
- array( 'known', 'noclasses' )
+ )
);
- /*
- watching could cause problems in edit mode:
- if user edits article, then loads "watch this article" in background and then saves
- 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 ) {
+ /**
+ * Watching could cause problems in edit mode:
+ * if user edits article, then loads "watch this article" in background and then saves
+ * 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 ( $this->data['loggedin'] && $articleExists ) {
if( $action != 'edit' && $action != 'submit' ) {
$s .= $sep . $this->watchThisPage();
}
- if ( $this->mTitle->userCan( 'edit' ) )
+ if ( $title->userCan( 'edit' ) )
$s .= $sep . $this->moveThisPage();
}
- if ( $wgUser->isAllowed( 'delete' ) && $articleExists ) {
+ if ( $this->getSkin()->getUser()->isAllowed( 'delete' ) && $articleExists ) {
$s .= $sep . $this->deleteThisPage() .
$sep . $this->protectThisPage();
}
@@ -238,38 +237,38 @@ class SkinStandard extends Skin {
}
$s .= $sep . $this->whatLinksHere();
- if( $wgOut->isArticleRelated() ) {
+ if( $this->getSkin()->getOutput()->isArticleRelated() ) {
$s .= $sep . $this->watchPageLinksLink();
}
if (
- NS_USER == $this->mTitle->getNamespace() ||
- $this->mTitle->getNamespace() == NS_USER_TALK
+ NS_USER == $title->getNamespace() ||
+ $title->getNamespace() == NS_USER_TALK
) {
- $id = User::idFromName( $this->mTitle->getText() );
- $ip = User::isIP( $this->mTitle->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( UploadBase::isEnabled() && UploadBase::isAllowed( $wgUser ) === true ) {
+ if( UploadBase::isEnabled() && UploadBase::isAllowed( $this->getSkin()->getUser() ) === true ) {
$s .= $this->getUploadLink() . $sep;
}
- $s .= $this->specialLink( 'Specialpages' );
+ $s .= Linker::specialLink( 'Specialpages' );
global $wgSiteSupportPage;
if( $wgSiteSupportPage ) {
$s .= "\n
' . wfMsg( 'sitesupport' ) . '';
+ '" class="internal">' . wfMsg( 'sitesupport' ) . '';
}
$s .= "\n