Fix regression in unwatch links sent out by enotif. {{FULLPAGENAMEE}} happens to...

[lhc/web/wiklou.git] / includes / SkinTemplate.php

diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index fa33fc6..86bcc8a 100644 (file)
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -134,9 +134,12 @@ class SkinTemplate extends Skin {
                global $wgMaxCredits, $wgShowCreditsIfMax;
                global $wgPageShowWatchingUsers;
                global $wgUseTrackbacks, $wgUseSiteJs, $wgDebugComments;
-               global $wgArticlePath, $wgScriptPath, $wgServer;
+               global $wgArticlePath, $wgScriptPath, $wgServer, $wgProfiler;
 
                wfProfileIn( __METHOD__ );
+               if ( is_object( $wgProfiler ) ) {
+                       $wgProfiler->setTemplated( true );
+               }
 
                $oldid = $wgRequest->getVal( 'oldid' );
                $diff = $wgRequest->getVal( 'diff' );
@@ -308,72 +311,29 @@ class SkinTemplate extends Skin {
                // Users can have their language set differently than the
                // content of the wiki. For these users, tell the web browser
                // that interface elements are in a different language.
-               $tpl->set( 'userlangattributes', '');
-               $tpl->set( 'specialpageattributes', '');
+               $tpl->set( 'userlangattributes', '' );
+               $tpl->set( 'specialpageattributes', '' );
 
-               $code = $wgLang->getCode();
+               $lang = $wgLang->getCode();
                $dir  = $wgLang->getDir();
-               if ( $code !== $wgContLang->getCode() || $dir !== $wgContLang->getDir() ) {
-                       $attrs = "lang='$lang' xml:lang='$lang' dir='$dir'";
+               if ( $lang !== $wgContLang->getCode() || $dir !== $wgContLang->getDir() ) {
+                       $attrs = " lang='$lang' dir='$dir'";
 
                        $tpl->set( 'userlangattributes', $attrs );
 
                        // The content of SpecialPages should be presented in the
                        // user's language. Content of regular pages should not be touched.
-                       if($this->mTitle->isSpecialPage()) {
+                       if( $this->mTitle->isSpecialPage() ) {
                                $tpl->set( 'specialpageattributes', $attrs );
                        }
                }
 
-               $newtalks = $wgUser->getNewMessageLinks();
-
-               if( count( $newtalks ) == 1 && $newtalks[0]['wiki'] === wfWikiID() ) {
-                       $usertitle = $this->mUser->getUserPage();
-                       $usertalktitle = $usertitle->getTalkPage();
-
-                       if( !$usertalktitle->equals( $this->mTitle ) ) {
-                               $newmessageslink = $this->link(
-                                       $usertalktitle,
-                                       wfMsgHtml( 'newmessageslink' ),
-                                       array(),
-                                       array( 'redirect' => 'no' ),
-                                       array( 'known', 'noclasses' )
-                               );
+               $newtalks = $this->getNewtalks();
 
-                               $newmessagesdifflink = $this->link(
-                                       $usertalktitle,
-                                       wfMsgHtml( 'newmessagesdifflink' ),
-                                       array(),
-                                       array( 'diff' => 'cur' ),
-                                       array( 'known', 'noclasses' )
-                               );
-
-                               $ntl = wfMsg(
-                                       'youhavenewmessages',
-                                       $newmessageslink,
-                                       $newmessagesdifflink
-                               );
-                               # Disable Cache
-                               $out->setSquidMaxage( 0 );
-                       }
-               } else if( count( $newtalks ) ) {
-                       // _>" " for BC <= 1.16
-                       $sep = str_replace( '_', ' ', wfMsgHtml( 'newtalkseparator' ) );
-                       $msgs = array();
-                       foreach( $newtalks as $newtalk ) {
-                               $msgs[] = Xml::element('a',
-                                       array( 'href' => $newtalk['link'] ), $newtalk['wiki'] );
-                       }
-                       $parts = implode( $sep, $msgs );
-                       $ntl = wfMsgHtml( 'youhavenewmessagesmulti', $parts );
-                       $out->setSquidMaxage( 0 );
-               } else {
-                       $ntl = '';
-               }
                wfProfileOut( __METHOD__ . '-stuff2' );
 
                wfProfileIn( __METHOD__ . '-stuff3' );
-               $tpl->setRef( 'newtalk', $ntl );
+               $tpl->setRef( 'newtalk', $newtalks );
                $tpl->setRef( 'skin', $this );
                $tpl->set( 'logo', $this->logoText() );
                if ( $out->isArticle() and ( !isset( $oldid ) or isset( $diff ) ) and
@@ -491,14 +451,6 @@ class SkinTemplate extends Skin {
                $content_actions = $this->buildContentActionUrls();
                $tpl->setRef( 'content_actions', $content_actions );
 
-               // XXX: attach this from javascript, same with section editing
-               if( $this->iseditable && $wgUser->getOption( 'editondblclick' ) ){
-                       $encEditUrl = Xml::escapeJsString( $this->mTitle->getLocalUrl( $this->editUrlOptions() ) );
-                       $tpl->set( 'body_ondblclick', 'document.location = "' . $encEditUrl . '";' );
-               } else {
-                       $tpl->set( 'body_ondblclick', false );
-               }
-               $tpl->set( 'body_onload', false );
                $tpl->set( 'sidebar', $this->buildSidebar() );
                $tpl->set( 'nav_urls', $this->buildNavUrls() );
 
@@ -760,23 +712,14 @@ class SkinTemplate extends Skin {
                                // adds new section link if page is a current revision of a talk page or
                                if ( ( $wgArticle && $wgArticle->isCurrent() && $istalk ) || $wgOut->showNewSectionLink() ) {
                                        if ( !$wgOut->forceHideNewSectionLink() ) {
-                                               $urlArgs = 'action=edit&section=new';
-                                               $preloadMsg = wfMsgForContent( 'talk-addsection-preload' );
-                                               $editintroMsg = wfMsgForContent( 'talk-addsection-editintro' );
-                                               if( $preloadMsg != ''  ) {
-                                                       $urlArgs .= '&preload=' . urlencode( $preloadMsg );
-                                               }
-                                               if( $editintroMsg != '' ) {
-                                                       $urlArgs .= '&editintro=' . urlencode( $editintroMsg );
-                                               }
                                                $content_actions['addsection'] = array(
                                                        'class' => $section == 'new' ? 'selected' : false,
                                                        'text' => wfMsg( 'addsection' ),
-                                                       'href' => $this->mTitle->getLocalUrl( $urlArgs )
+                                                       'href' => $this->mTitle->getLocalUrl( 'action=edit&section=new' )
                                                );
                                        }
                                }
-                       } elseif ( $this->mTitle->isKnown() ) {
+                       } elseif ( $this->mTitle->hasSourceText() ) {
                                $content_actions['viewsource'] = array(
                                        'class' => ($action == 'edit') ? 'selected' : false,
                                        'text' => wfMsg( 'viewsource' ),
@@ -987,8 +930,10 @@ class SkinTemplate extends Skin {
                }
 
                if( $this->mTitle->getNamespace() == NS_USER || $this->mTitle->getNamespace() == NS_USER_TALK ) {
-                       $id = User::idFromName( $this->mTitle->getText() );
-                       $ip = User::isIP( $this->mTitle->getText() );
+                       $parts = explode( '/', $this->mTitle->getText() );
+                       $rootUser = $parts[0];
+                       $id = User::idFromName( $rootUser );
+                       $ip = User::isIP( $rootUser );
                } else {
                        $id = 0;
                        $ip = false;
@@ -996,7 +941,7 @@ class SkinTemplate extends Skin {
 
                if( $id || $ip ) { # both anons and non-anons have contribs list
                        $nav_urls['contributions'] = array(
-                               'href' => self::makeSpecialUrlSubpage( 'Contributions', $this->mTitle->getText() )
+                               'href' => self::makeSpecialUrlSubpage( 'Contributions', $rootUser )
                        );
 
                        if( $id ) {
@@ -1004,7 +949,7 @@ class SkinTemplate extends Skin {
                                $nav_urls['log'] = array(
                                        'href' => $logPage->getLocalUrl(
                                                array(
-                                                       'user' => $this->mTitle->getText()
+                                                       'user' => $rootUser
                                                )
                                        )
                                );
@@ -1014,7 +959,7 @@ class SkinTemplate extends Skin {
 
                        if ( $wgUser->isAllowed( 'block' ) ) {
                                $nav_urls['blockip'] = array(
-                                       'href' => self::makeSpecialUrlSubpage( 'Blockip', $this->mTitle->getText() )
+                                       'href' => self::makeSpecialUrlSubpage( 'Blockip', $rootUser )
                                );
                        } else {
                                $nav_urls['blockip'] = false;
@@ -1027,7 +972,7 @@ class SkinTemplate extends Skin {
                $nav_urls['emailuser'] = false;
                if( $this->showEmailUser( $id ) ) {
                        $nav_urls['emailuser'] = array(
-                               'href' => self::makeSpecialUrlSubpage( 'Emailuser', $this->mTitle->getText() )
+                               'href' => self::makeSpecialUrlSubpage( 'Emailuser', $rootUser )
                        );
                }
                wfProfileOut( __METHOD__ );