| Index: trunk/phase3/skins/CologneBlue.php |
| — | — | @@ -127,7 +127,7 @@ |
| 128 | 128 | $li = $wgContLang->specialPage( 'Userlogin' ); |
| 129 | 129 | $lo = $wgContLang->specialPage( 'Userlogout' ); |
| 130 | 130 | |
| 131 | | - $rt = $wgOut->getTitle()->getPrefixedURL(); |
| | 131 | + $rt = $this->mTitle->getPrefixedURL(); |
| 132 | 132 | if ( 0 == strcasecmp( urlencode( $lo ), $rt ) ) { |
| 133 | 133 | $q = ''; |
| 134 | 134 | } else { |
| — | — | @@ -165,7 +165,7 @@ |
| 166 | 166 | function quickBar(){ |
| 167 | 167 | global $wgOut, $wgUser, $wgEnableUploads; |
| 168 | 168 | |
| 169 | | - $tns = $wgOut->getTitle()->getNamespace(); |
| | 169 | + $tns = $this->mTitle->getNamespace(); |
| 170 | 170 | |
| 171 | 171 | $s = "\n<div id='quickbar'>"; |
| 172 | 172 | |
| — | — | @@ -228,7 +228,7 @@ |
| 229 | 229 | . $sep . $this->watchPageLinksLink(); |
| 230 | 230 | |
| 231 | 231 | if( $tns == NS_USER || $tns == NS_USER_TALK ) { |
| 232 | | - $id = User::idFromName( $wgOut->getTitle()->getText() ); |
| | 232 | + $id = User::idFromName( $this->mTitle->getText() ); |
| 233 | 233 | if( $id != 0 ) { |
| 234 | 234 | $s .= $sep . $this->userContribsLink(); |
| 235 | 235 | if( $this->showEmailUser( $id ) ) { |
| Index: trunk/phase3/skins/Standard.php |
| — | — | @@ -137,7 +137,7 @@ |
| 138 | 138 | |
| 139 | 139 | $action = $wgRequest->getText( 'action' ); |
| 140 | 140 | $wpPreview = $wgRequest->getBool( 'wpPreview' ); |
| 141 | | - $tns = $wgOut->getTitle()->getNamespace(); |
| | 141 | + $tns = $this->mTitle->getNamespace(); |
| 142 | 142 | |
| 143 | 143 | $s = "\n<div id='quickbar'>"; |
| 144 | 144 | $s .= "\n" . $this->logoText() . "\n<hr class='sep' />"; |
| — | — | @@ -165,7 +165,7 @@ |
| 166 | 166 | } |
| 167 | 167 | // only show watchlist link if logged in |
| 168 | 168 | $s .= "\n<hr class='sep' />"; |
| 169 | | - $articleExists = $wgOut->getTitle()->getArticleId(); |
| | 169 | + $articleExists = $this->mTitle->getArticleId(); |
| 170 | 170 | if ( $wgOut->isArticle() || $action == 'edit' || $action == 'history' || $wpPreview ) { |
| 171 | 171 | if( $wgOut->isArticle() ) { |
| 172 | 172 | $s .= '<strong>' . $this->editThisPage() . '</strong>'; |
| — | — | @@ -210,13 +210,13 @@ |
| 211 | 211 | $text = wfMsg( 'articlepage' ); |
| 212 | 212 | } |
| 213 | 213 | |
| 214 | | - $link = $wgOut->getTitle()->getText(); |
| | 214 | + $link = $this->mTitle->getText(); |
| 215 | 215 | if( $nstext = $wgContLang->getNsText( $tns ) ) { # add namespace if necessary |
| 216 | 216 | $link = $nstext . ':' . $link; |
| 217 | 217 | } |
| 218 | 218 | |
| 219 | 219 | $s .= $this->makeLink( $link, $text ); |
| 220 | | - } elseif( $wgOut->getTitle()->getNamespace() != NS_SPECIAL ) { |
| | 220 | + } elseif( $this->mTitle->getNamespace() != NS_SPECIAL ) { |
| 221 | 221 | # we just throw in a "New page" text to tell the user that he's in edit mode, |
| 222 | 222 | # and to avoid messing with the separator that is prepended to the next item |
| 223 | 223 | $s .= '<strong>' . wfMsg( 'newpage' ) . '</strong>'; |
| — | — | @@ -225,8 +225,8 @@ |
| 226 | 226 | } |
| 227 | 227 | |
| 228 | 228 | # "Post a comment" link |
| 229 | | - if( ( $wgOut->getTitle()->isTalkPage() || $wgOut->showNewSectionLink() ) && $action != 'edit' && !$wpPreview ) |
| 230 | | - $s .= '<br />' . $this->makeKnownLinkObj( $wgOut->getTitle(), wfMsg( 'postcomment' ), 'action=edit§ion=new' ); |
| | 229 | + if( ( $this->mTitle->isTalkPage() || $wgOut->showNewSectionLink() ) && $action != 'edit' && !$wpPreview ) |
| | 230 | + $s .= '<br />' . $this->makeKnownLinkObj( $this->mTitle, wfMsg( 'postcomment' ), 'action=edit§ion=new' ); |
| 231 | 231 | |
| 232 | 232 | #if( $tns%2 && $action!='edit' && !$wpPreview) { |
| 233 | 233 | #$s.= '<br />'.$this->makeKnownLink($wgTitle->getPrefixedText(),wfMsg('postcomment'),'action=edit§ion=new'); |
| — | — | @@ -242,7 +242,7 @@ |
| 243 | 243 | if( $action != 'edit' && $action != 'submit' ){ |
| 244 | 244 | $s .= $sep . $this->watchThisPage(); |
| 245 | 245 | } |
| 246 | | - if ( $wgOut->getTitle()->userCan( 'edit' ) ) |
| | 246 | + if ( $this->mTitle->userCan( 'edit' ) ) |
| 247 | 247 | $s .= $sep . $this->moveThisPage(); |
| 248 | 248 | } |
| 249 | 249 | if ( $wgUser->isAllowed( 'delete' ) and $articleExists ) { |
| — | — | @@ -259,11 +259,11 @@ |
| 260 | 260 | $s .= $sep . $this->watchPageLinksLink(); |
| 261 | 261 | } |
| 262 | 262 | |
| 263 | | - if ( NS_USER == $wgOut->getTitle()->getNamespace() |
| 264 | | - || $wgOut->getTitle()->getNamespace() == NS_USER_TALK ) { |
| | 263 | + if ( NS_USER == $this->mTitle->getNamespace() |
| | 264 | + || $this->mTitle->getNamespace() == NS_USER_TALK ) { |
| 265 | 265 | |
| 266 | | - $id = User::idFromName( $wgOut->getTitle()->getText() ); |
| 267 | | - $ip = User::isIP( $wgOut->getTitle()->getText() ); |
| | 266 | + $id = User::idFromName( $this->mTitle->getText() ); |
| | 267 | + $ip = User::isIP( $this->mTitle->getText() ); |
| 268 | 268 | |
| 269 | 269 | if( $id || $ip ){ |
| 270 | 270 | $s .= $sep . $this->userContribsLink(); |