X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fparser%2FParserOptions.php;h=891c4dde6cc43366c33847f03011c349cc29957f;hb=010410265a5505b44a273bb119d8fac7f1fa7739;hp=729b9db8a99d10eb36b3a3d2b29ccac441e42672;hpb=b8fce54279c4bc169247697642d87a1c8426e6d3;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/parser/ParserOptions.php b/includes/parser/ParserOptions.php
index 729b9db8a9..891c4dde6c 100644
--- a/includes/parser/ParserOptions.php
+++ b/includes/parser/ParserOptions.php
@@ -117,17 +117,22 @@ class ParserOptions {
 	private $mRemoveComments = true;
 
 	/**
-	 * Callback for current revision fetching. Used as first argument to call_user_func().
+	 * @var callable Callback for current revision fetching; first argument to call_user_func().
 	 */
 	private $mCurrentRevisionCallback =
 		[ 'Parser', 'statelessFetchRevision' ];
 
 	/**
-	 * Callback for template fetching. Used as first argument to call_user_func().
+	 * @var callable Callback for template fetching; first argument to call_user_func().
 	 */
 	private $mTemplateCallback =
 		[ 'Parser', 'statelessFetchTemplate' ];
 
+	/**
+	 * @var callable|null Callback to generate a guess for {{REVISIONID}}
+	 */
+	private $mSpeculativeRevIdCallback;
+
 	/**
 	 * Enable limit report in an HTML comment on output
 	 */
@@ -302,6 +307,11 @@ class ParserOptions {
 		return $this->mTemplateCallback;
 	}
 
+	/** @since 1.28 */
+	public function getSpeculativeRevIdCallback() {
+		return $this->mSpeculativeRevIdCallback;
+	}
+
 	public function getEnableLimitReport() {
 		return $this->mEnableLimitReport;
 	}
@@ -483,6 +493,11 @@ class ParserOptions {
 		return wfSetVar( $this->mCurrentRevisionCallback, $x );
 	}
 
+	/** @since 1.28 */
+	public function setSpeculativeRevIdCallback( $x ) {
+		return wfSetVar( $this->mSpeculativeRevIdCallback, $x );
+	}
+
 	public function setTemplateCallback( $x ) {
 		return wfSetVar( $this->mTemplateCallback, $x );
 	}
@@ -701,7 +716,7 @@ class ParserOptions {
 		}
 		// Check the object and lazy-loaded options
 		return (
-			$this->mUserLang->getCode() === $other->mUserLang->getCode() &&
+			$this->mUserLang->equals( $other->mUserLang ) &&
 			$this->getDateFormat() === $other->getDateFormat()
 		);
 	}