* (bug 19006) {{REVISIONUSER}} no longer acts like {{CURRENTUSER}} in some cases

* Removed other usages of $wgUser in Parser stuff, as stated in doc
* Added mechanism to get an User object in Parser, based either on the object given in Paser::preSaveTransform() or the ParserOptions otherwise

diff --git a/includes/parser/CoreParserFunctions.php b/includes/parser/CoreParserFunctions.php
index 9494922..e9f3c4c 100644 (file)
--- a/includes/parser/CoreParserFunctions.php
+++ b/includes/parser/CoreParserFunctions.php
@@ -244,13 +244,12 @@ class CoreParserFunctions {
                if ( is_object( $title ) && $title->getNamespace() == NS_USER )
                        $user = $title->getText();
 
-               // check parameter, or use $wgUser if in interface message
+               // check parameter, or use the ParserOptions if in interface message
                $user = User::newFromName( $user );
                if ( $user ) {
                        $gender = $user->getOption( 'gender' );
                } elseif ( $parser->getOptions()->getInterfaceMessage() ) {
-                       global $wgUser;
-                       $gender = $wgUser->getOption( 'gender' );
+                       $gender = $parser->getOptions()->getUser()->getOption( 'gender' );
                }
                $ret = $parser->getFunctionLang()->gender( $gender, $forms );
                wfProfileOut( __METHOD__ );

diff --git a/includes/parser/LinkHolderArray.php b/includes/parser/LinkHolderArray.php
index 01f29e0..23d7153 100644 (file)
--- a/includes/parser/LinkHolderArray.php
+++ b/includes/parser/LinkHolderArray.php
@@ -105,9 +105,8 @@ class LinkHolderArray {
         * Get the stub threshold
         */
        function getStubThreshold() {
-               global $wgUser;
                if ( !isset( $this->stubThreshold ) ) {
-                       $this->stubThreshold = $wgUser->getStubThreshold();
+                       $this->stubThreshold = $this->parent->getUser()->getStubThreshold();
                }
                return $this->stubThreshold;
        }

diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index b5b8c7f..8cac644 100644 (file)
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -103,6 +103,7 @@ class Parser {
        var $mTplExpandCache; # empty-frame expansion cache
        var $mTplRedirCache, $mTplDomCache, $mHeadings, $mDoubleUnderscores;
        var $mExpensiveFunctionCount; # number of expensive parser function calls
+       var $mUser; # User object; only used when doing pre-save transform
 
        # Temporary
        # These are variables reset at least once per parse regardless of $clearState
@@ -110,8 +111,10 @@ class Parser {
        var $mTitle;        # Title context, used for self-link rendering and similar things
        var $mOutputType;   # Output type, one of the OT_xxx constants
        var $ot;            # Shortcut alias, see setOutputType()
+       var $mRevisionObject; # The revision object of the specified revision ID
        var $mRevisionId;   # ID to display in {{REVISIONID}} tags
        var $mRevisionTimestamp; # The timestamp of the specified revision ID
+       var $mRevisionUser; # Userto display in {{REVISIONUSER}} tag
        var $mRevIdForTs;   # The revision ID which was used to fetch the timestamp
 
        /**
@@ -197,8 +200,10 @@ class Parser {
                $this->mInPre = false;
                $this->mLinkHolders = new LinkHolderArray( $this );
                $this->mLinkID = 0;
-               $this->mRevisionTimestamp = $this->mRevisionId = null;
+               $this->mRevisionObject = $this->mRevisionTimestamp =
+                       $this->mRevisionId = $this->mRevisionUser = null;
                $this->mVarCache = array();
+               $this->mUser = null;
 
                /**
                 * Prefix for temporary replacement strings for the multipass parser.
@@ -271,10 +276,14 @@ class Parser {
                $this->setTitle( $title ); # Page title has to be set for the pre-processor
 
                $oldRevisionId = $this->mRevisionId;
+               $oldRevisionObject = $this->mRevisionObject;
                $oldRevisionTimestamp = $this->mRevisionTimestamp;
+               $oldRevisionUser = $this->mRevisionUser;
                if ( $revid !== null ) {
                        $this->mRevisionId = $revid;
+                       $this->mRevisionObject = null;
                        $this->mRevisionTimestamp = null;
+                       $this->mRevisionUser = null;
                }
                $this->setOutputType( self::OT_HTML );
                wfRunHooks( 'ParserBeforeStrip', array( &$this, &$text, &$this->mStripState ) );
@@ -422,7 +431,9 @@ class Parser {
                $this->mOutput->setText( $text );
 
                $this->mRevisionId = $oldRevisionId;
+               $this->mRevisionObject = $oldRevisionObject;
                $this->mRevisionTimestamp = $oldRevisionTimestamp;
+               $this->mRevisionUser = $oldRevisionUser;
                wfProfileOut( $fname );
                wfProfileOut( __METHOD__ );
 
@@ -498,6 +509,16 @@ class Parser {
                return dechex( mt_rand( 0, 0x7fffffff ) ) . dechex( mt_rand( 0, 0x7fffffff ) );
        }
 
+       /**
+        * Set the current user.
+        * Should only be used when doing pre-save transform.
+        *
+        * @param $user Mixed: User object or null (to reset)
+        */
+       function setUser( $user ) {
+               $this->mUser = $user;
+       }
+
        /**
         * Accessor for mUniqPrefix.
         *
@@ -621,6 +642,18 @@ class Parser {
                }
        }
 
+       /**
+        * Get a User object either from $this->mUser, if set, or from the
+        * ParserOptions object otherwise
+        *
+        * @return User object
+        */
+       function getUser() {
+               if( !is_null( $this->mUser ) )
+                       return $this->mUser;
+               return $this->mOptions->getUser();
+       }
+
        /**
         * Get a preprocessor object
         *
@@ -1842,7 +1875,7 @@ class Parser {
 
                                if ( $ns == NS_CATEGORY ) {
                                        wfProfileIn( __METHOD__."-category" );
-                                       $s = rtrim( $s . "\n" ); # bug 87
+                                       $s = preg_replace( "/(\s*\n)+\s*$/D", '', $s ); # bug 87
 
                                        if ( $wasblank ) {
                                                $sortkey = $this->getDefaultSort();
@@ -1858,7 +1891,7 @@ class Parser {
                                         * Strip the whitespace Category links produce, see bug 87
                                         * @todo We might want to use trim($tmp, "\n") here.
                                         */
-                                       $s .= trim( $prefix . $trail, "\n" ) == '' ? '': $prefix . $trail;
+                                       $s .= trim( $prefix . $trail, "\n" ) == '' ? '' : $prefix . $trail;
 
                                        wfProfileOut( __METHOD__."-category" );
                                        continue;
@@ -3995,6 +4028,7 @@ class Parser {
                $options->resetUsage();
                $this->mOptions = $options;
                $this->setTitle( $title );
+               $this->setUser( $user );
                $this->setOutputType( self::OT_WIKI );
 
                if ( $clearState ) {
@@ -4007,6 +4041,9 @@ class Parser {
                $text = str_replace( array_keys( $pairs ), array_values( $pairs ), $text );
                $text = $this->pstPass2( $text, $user );
                $text = $this->mStripState->unstripBoth( $text );
+
+               $this->setUser( null ); #Reset
+
                return $text;
        }
 
@@ -4940,6 +4977,21 @@ class Parser {
                return $this->mRevisionId;
        }
 
+       /**
+        * Get the revision object for $this->mRevisionId
+        *
+        * @return either a Revision object or null
+        */
+       protected function getRevisionObject() {
+               if ( !is_null( $this->mRevisionObject ) )
+                       return $this->mRevisionObject;
+               if ( is_null( $this->mRevisionId ) )
+                       return null;
+
+               $this->mRevisionObject = Revision::newFromId( $this->mRevisionId );
+               return $this->mRevisionObject;
+       }
+
        /**
         * Get the timestamp associated with the current revision, adjusted for
         * the default server-local timestamp
@@ -4947,24 +4999,21 @@ class Parser {
        function getRevisionTimestamp() {
                if ( is_null( $this->mRevisionTimestamp ) ) {
                        wfProfileIn( __METHOD__ );
-                       global $wgContLang;
-                       $dbr = wfGetDB( DB_SLAVE );
-                       $timestamp = $dbr->selectField( 'revision', 'rev_timestamp',
-                                       array( 'rev_id' => $this->mRevisionId ), __METHOD__ );
-
-                       # Normalize timestamp to internal MW format for timezone processing.
-                       # This has the added side-effect of replacing a null value with
-                       # the current time, which gives us more sensible behavior for
-                       # previews.
-                       $timestamp = wfTimestamp( TS_MW, $timestamp );
-
-                       # The cryptic '' timezone parameter tells to use the site-default
-                       # timezone offset instead of the user settings.
-                       #
-                       # Since this value will be saved into the parser cache, served
-                       # to other users, and potentially even used inside links and such,
-                       # it needs to be consistent for all visitors.
-                       $this->mRevisionTimestamp = $wgContLang->userAdjust( $timestamp, '' );
+
+                       $revObject = $this->getRevisionObject();
+                       $timestamp = $revObject ? $revObject->getTimestamp() : false;
+
+                       if( $timestamp !== false ) {
+                               global $wgContLang;
+
+                               # The cryptic '' timezone parameter tells to use the site-default
+                               # timezone offset instead of the user settings.
+                               #
+                               # Since this value will be saved into the parser cache, served
+                               # to other users, and potentially even used inside links and such,
+                               # it needs to be consistent for all visitors.
+                               $this->mRevisionTimestamp = $wgContLang->userAdjust( $timestamp, '' );
+                       }
 
                        wfProfileOut( __METHOD__ );
                }
@@ -4977,16 +5026,18 @@ class Parser {
         * @return String: user name
         */
        function getRevisionUser() {
-               # if this template is subst: the revision id will be blank,
-               # so just use the current user's name
-               if ( $this->mRevisionId ) {
-                       $revision = Revision::newFromId( $this->mRevisionId );
-                       $revuser = $revision->getUserText();
-               } else {
-                       global $wgUser;
-                       $revuser = $wgUser->getName();
+               if( is_null( $this->mRevisionUser ) ) {
+                       $revObject = $this->getRevisionObject();
+
+                       # if this template is subst: the revision id will be blank,
+                       # so just use the current user's name
+                       if( $revObject ) {
+                               $this->mRevisionUser = $revObject->getUserText();
+                       } elseif( $this->ot['wiki'] || $this->mOptions->getIsPreview() ) {
+                               $this->mRevisionUser = $this->getUser()->getName();
+                       }
                }
-               return $revuser;
+               return $this->mRevisionUser;
        }
 
        /**

diff --git a/includes/parser/ParserOptions.php b/includes/parser/ParserOptions.php
index 40ee6cf..c693bb3 100644 (file)
--- a/includes/parser/ParserOptions.php
+++ b/includes/parser/ParserOptions.php
@@ -40,7 +40,7 @@ class ParserOptions {
        var $mThumbSize;                 # Thumb size preferred by the user.
        var $mCleanSignatures;           #
 
-       var $mUser;                      # Stored user object, just used to initialise the skin
+       var $mUser;                      # Stored user object
        var $mIsPreview;                 # Parsing the page for a "preview" operation
        var $mIsSectionPreview;          # Parsing the page for a "preview" operation on a single section
        var $mIsPrintable;               # Parsing the printable version of the page
@@ -80,6 +80,7 @@ class ParserOptions {
        function getIsSectionPreview()              { return $this->mIsSectionPreview; }
        function getIsPrintable()                   { $this->accessedOptions['printable'] = true;
                                                      return $this->mIsPrintable; }
+       function getUser()                          { return $this->mUser; }
 
        function getSkin( $title = null ) {
                if ( !isset( $this->mSkin ) ) {