X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Fspecials%2FSpecialMergeHistory.php;h=5b77d5a112029e8a099bba848b278c51d322901f;hb=3bb3c8b0ae092b2e667f6f33abfc98f9c205d53c;hp=f122db8a37d87a90c5a43447798c9b004fee19bc;hpb=4721eb350a8e786cf44ec0d4d4fdf22417df7ba9;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/specials/SpecialMergeHistory.php b/includes/specials/SpecialMergeHistory.php
index f122db8a37..5b77d5a112 100644
--- a/includes/specials/SpecialMergeHistory.php
+++ b/includes/specials/SpecialMergeHistory.php
@@ -21,6 +21,8 @@
  * @ingroup SpecialPage
  */
 
+use MediaWiki\Storage\RevisionRecord;
+
 /**
  * Special page allowing users with the appropriate permissions to
  * merge article histories, with some restrictions
@@ -224,11 +226,11 @@ class SpecialMergeHistory extends SpecialPage {
 					'</td>
 					<td class="mw-input">' .
 					Xml::input( 'wpComment', 50, $this->mComment, [ 'id' => 'wpComment' ] ) .
-					'</td>
+					"</td>
 					</tr>
 					<tr>
-						<td>&#160;</td>
-						<td class="mw-submit">' .
+						<td>\u{00A0}</td>
+						<td class=\"mw-submit\">" .
 					Xml::submitButton(
 						$this->msg( 'mergehistory-submit' )->text(),
 						[ 'name' => 'merge', 'id' => 'mw-merge-submit' ]
@@ -293,12 +295,12 @@ class SpecialMergeHistory extends SpecialPage {
 			[],
 			[ 'oldid' => $rev->getId() ]
 		);
-		if ( $rev->isDeleted( Revision::DELETED_TEXT ) ) {
+		if ( $rev->isDeleted( RevisionRecord::DELETED_TEXT ) ) {
 			$pageLink = '<span class="history-deleted">' . $pageLink . '</span>';
 		}
 
 		# Last link
-		if ( !$rev->userCan( Revision::DELETED_TEXT, $user ) ) {
+		if ( !$rev->userCan( RevisionRecord::DELETED_TEXT, $user ) ) {
 			$last = $this->msg( 'last' )->escaped();
 		} elseif ( isset( $this->prevId[$row->rev_id] ) ) {
 			$last = $linkRenderer->makeKnownLink(