X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22suivi_revisions%22%29%20.%20%22?a=blobdiff_plain;f=includes%2Fparser%2FCoreParserFunctions.php;h=b803241956bd1170d2b48a8884bde479f4513d80;hb=424eb75d77f7a7513cd59083198f5b3a407a8715;hp=a7916c5796f81d7d5b7b6df1601c5e575d93af95;hpb=7af7bbe7476996bf60d8d8e48a84687ccd7505df;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/parser/CoreParserFunctions.php b/includes/parser/CoreParserFunctions.php
index a7916c5796..b803241956 100644
--- a/includes/parser/CoreParserFunctions.php
+++ b/includes/parser/CoreParserFunctions.php
@@ -434,7 +434,7 @@ class CoreParserFunctions {
 		if ( !$wgRestrictDisplayTitle ||
 			( $title instanceof Title
 			&& !$title->hasFragment()
-			&& $title->equals( $parser->mTitle ) )
+			&& $title->equals( $parser->getTitle() ) )
 		) {
 			$old = $parser->mOutput->getProperty( 'displaytitle' );
 			if ( $old === false || $arg !== 'displaytitle_noreplace' ) {
@@ -845,10 +845,7 @@ class CoreParserFunctions {
 	 * @return string
 	 */
 	public static function protectionlevel( $parser, $type = '', $title = '' ) {
-		$titleObject = Title::newFromText( $title );
-		if ( !( $titleObject instanceof Title ) ) {
-			$titleObject = $parser->mTitle;
-		}
+		$titleObject = Title::newFromText( $title ) ?? $parser->getTitle();
 		if ( $titleObject->areRestrictionsLoaded() || $parser->incrementExpensiveFunctionCount() ) {
 			$restrictions = $titleObject->getRestrictions( strtolower( $type ) );
 			# Title::getRestrictions returns an array, its possible it may have
@@ -871,10 +868,7 @@ class CoreParserFunctions {
 	 * @return string
 	 */
 	public static function protectionexpiry( $parser, $type = '', $title = '' ) {
-		$titleObject = Title::newFromText( $title );
-		if ( !( $titleObject instanceof Title ) ) {
-			$titleObject = $parser->mTitle;
-		}
+		$titleObject = Title::newFromText( $title ) ?? $parser->getTitle();
 		if ( $titleObject->areRestrictionsLoaded() || $parser->incrementExpensiveFunctionCount() ) {
 			$expiry = $titleObject->getRestrictionExpiry( strtolower( $type ) );
 			// getRestrictionExpiry() returns false on invalid type; trying to
@@ -1127,7 +1121,7 @@ class CoreParserFunctions {
 	 * @param Parser $parser
 	 * @param Title $title
 	 * @param string $vary ParserOuput vary-* flag
-	 * @return Revision
+	 * @return Revision|null
 	 * @since 1.23
 	 */
 	private static function getCachedRevisionObject( $parser, $title, $vary ) {
@@ -1377,10 +1371,7 @@ class CoreParserFunctions {
 	 * @since 1.23
 	 */
 	public static function cascadingsources( $parser, $title = '' ) {
-		$titleObject = Title::newFromText( $title );
-		if ( !( $titleObject instanceof Title ) ) {
-			$titleObject = $parser->mTitle;
-		}
+		$titleObject = Title::newFromText( $title ) ?? $parser->getTitle();
 		if ( $titleObject->areCascadeProtectionSourcesLoaded()
 			|| $parser->incrementExpensiveFunctionCount()
 		) {