X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2FTitle.php;h=66aadebc1938e4e2c51155406dded784376b0a57;hp=82d9fd9ae6f59147d502ffd2fb21275fed72c944;hb=f4ec592330517bc80e2ee351d0385e752f16e3fb;hpb=38907a449e21c4db8f97d14963ceb6c9c022a333

diff --git a/includes/Title.php b/includes/Title.php
index 82d9fd9ae6..66aadebc19 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -1320,7 +1320,7 @@ class Title implements LinkTarget {
 	 * @deprecated Since 1.31; use ::isSiteConfigPage() instead
 	 */
 	public function isCssOrJsPage() {
-		// wfDeprecated( __METHOD__, '1.31' );
+		wfDeprecated( __METHOD__, '1.31' );
 		return ( NS_MEDIAWIKI == $this->mNamespace
 				&& ( $this->hasContentModel( CONTENT_MODEL_CSS )
 					|| $this->hasContentModel( CONTENT_MODEL_JAVASCRIPT ) ) );
@@ -1348,7 +1348,7 @@ class Title implements LinkTarget {
 	 * @deprecated Since 1.31; use ::isUserConfigPage() instead
 	 */
 	public function isCssJsSubpage() {
-		// wfDeprecated( __METHOD__, '1.31' );
+		wfDeprecated( __METHOD__, '1.31' );
 		return ( NS_USER == $this->mNamespace && $this->isSubpage()
 				&& ( $this->hasContentModel( CONTENT_MODEL_CSS )
 					|| $this->hasContentModel( CONTENT_MODEL_JAVASCRIPT ) ) );
@@ -1398,7 +1398,7 @@ class Title implements LinkTarget {
 	 * @return bool
 	 */
 	public function isCssSubpage() {
-		// wfDeprecated( __METHOD__, '1.31' );
+		wfDeprecated( __METHOD__, '1.31' );
 		return $this->isUserCssConfigPage();
 	}
 
@@ -1417,11 +1417,11 @@ class Title implements LinkTarget {
 	}
 
 	/**
-	 * @deprecated Since 1.31; use ::isUserCssConfigPage()
+	 * @deprecated Since 1.31; use ::isUserJsConfigPage()
 	 * @return bool
 	 */
 	public function isJsSubpage() {
-		// wfDeprecated( __METHOD__, '1.31' );
+		wfDeprecated( __METHOD__, '1.31' );
 		return $this->isUserJsConfigPage();
 	}
 
@@ -4468,17 +4468,18 @@ class Title implements LinkTarget {
 			return $authors;
 		}
 		$dbr = wfGetDB( DB_REPLICA );
-		$res = $dbr->select( 'revision', 'DISTINCT rev_user_text',
+		$revQuery = Revision::getQueryInfo();
+		$authors = $dbr->selectFieldValues(
+			$revQuery['tables'],
+			$revQuery['fields']['rev_user_text'],
 			[
 				'rev_page' => $this->getArticleID(),
 				"rev_timestamp $old_cmp " . $dbr->addQuotes( $dbr->timestamp( $old->getTimestamp() ) ),
 				"rev_timestamp $new_cmp " . $dbr->addQuotes( $dbr->timestamp( $new->getTimestamp() ) )
 			], __METHOD__,
-			[ 'LIMIT' => $limit + 1 ] // add one so caller knows it was truncated
+			[ 'DISTINCT', 'LIMIT' => $limit + 1 ], // add one so caller knows it was truncated
+			$revQuery['joins']
 		);
-		foreach ( $res as $row ) {
-			$authors[] = $row->rev_user_text;
-		}
 		return $authors;
 	}