X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Fchanges%2FEnhancedChangesList.php;h=0df6828162f879ababf223b0ef0a7e2990072706;hp=be488feed4a3cc682a37ef0b9b78059bd19bee71;hb=5fa4cdf860c79b32ab6ef034c6d9420c2727f695;hpb=d65f49aa78968d97b9d602ec084331995c1e5351

diff --git a/includes/changes/EnhancedChangesList.php b/includes/changes/EnhancedChangesList.php
index be488feed4..0df6828162 100644
--- a/includes/changes/EnhancedChangesList.php
+++ b/includes/changes/EnhancedChangesList.php
@@ -91,7 +91,7 @@ class EnhancedChangesList extends ChangesList {
 	/**
 	 * Format a line for enhanced recentchange (aka with javascript and block of lines).
 	 *
-	 * @param RecentChange $rc
+	 * @param RecentChange &$rc
 	 * @param bool $watched
 	 * @param int $linenumber (default null)
 	 *
@@ -172,12 +172,14 @@ class EnhancedChangesList extends ChangesList {
 		$recentChangesFlags = $this->getConfig()->get( 'RecentChangesFlags' );
 
 		# Add the namespace and title of the block as part of the class
-		$tableClasses = [ 'mw-collapsible', 'mw-collapsed', 'mw-enhanced-rc' ];
+		$tableClasses = [ 'mw-collapsible', 'mw-collapsed', 'mw-enhanced-rc', 'mw-changeslist-line' ];
 		if ( $block[0]->mAttribs['rc_log_type'] ) {
 			# Log entry
+			$tableClasses[] = 'mw-changeslist-log';
 			$tableClasses[] = Sanitizer::escapeClass( 'mw-changeslist-log-'
 				. $block[0]->mAttribs['rc_log_type'] );
 		} else {
+			$tableClasses[] = 'mw-changeslist-edit';
 			$tableClasses[] = Sanitizer::escapeClass( 'mw-changeslist-ns'
 				. $block[0]->mAttribs['rc_namespace'] . '-' . $block[0]->mAttribs['rc_title'] );
 		}
@@ -330,6 +332,11 @@ class EnhancedChangesList extends ChangesList {
 			implode( $this->message['semicolon-separator'], $users )
 		)->escaped();
 
+		$prefix = '';
+		if ( is_callable( $this->changeLinePrefixer ) ) {
+			$prefix = call_user_func( $this->changeLinePrefixer, $block[0], $this, true );
+		}
+
 		$templateParams = [
 			'articleLink' => $articleLink,
 			'charDifference' => $charDifference,
@@ -338,6 +345,7 @@ class EnhancedChangesList extends ChangesList {
 			'lines' => $lines,
 			'logText' => $logText,
 			'numberofWatchingusers' => $numberofWatchingusers,
+			'prefix' => $prefix,
 			'rev-deleted-event' => $revDeletedMsg,
 			'tableClasses' => $tableClasses,
 			'timestamp' => $block[0]->timestamp,
@@ -367,7 +375,7 @@ class EnhancedChangesList extends ChangesList {
 
 		$type = $rcObj->mAttribs['rc_type'];
 		$data = [];
-		$lineParams = [];
+		$lineParams = [ 'targetTitle' => $rcObj->getTitle() ];
 
 		$classes = [ 'mw-enhanced-rc' ];
 		if ( $rcObj->watched
@@ -375,7 +383,7 @@ class EnhancedChangesList extends ChangesList {
 		) {
 			$classes[] = 'mw-enhanced-watched';
 		}
-		$classes = array_merge( $classes, $this->getHTMLClassesForFilters( $rcObj ) );
+		$classes = array_merge( $classes, $this->getHTMLClasses( $rcObj, $rcObj->watched ) );
 
 		$separator = ' <span class="mw-changeslist-separator">. .</span> ';
 
@@ -507,7 +515,7 @@ class EnhancedChangesList extends ChangesList {
 
 		$sinceLast = 0;
 		$unvisitedOldid = null;
-		/** @var $rcObj RCCacheEntry */
+		/** @var RCCacheEntry $rcObj */
 		foreach ( $block as $rcObj ) {
 			// Same logic as below inside main foreach
 			if ( $rcObj->watched && $rcObj->mAttribs['rc_timestamp'] >= $rcObj->watched ) {
@@ -529,7 +537,7 @@ class EnhancedChangesList extends ChangesList {
 
 		# Total change link
 		$links = [];
-		/** @var $block0 RecentChange */
+		/** @var RecentChange $block0 */
 		$block0 = $block[0];
 		$last = $block[count( $block ) - 1];
 		if ( !$allLogs ) {
@@ -610,8 +618,10 @@ class EnhancedChangesList extends ChangesList {
 
 		if ( $logType ) {
 			# Log entry
+			$classes[] = 'mw-changeslist-log';
 			$classes[] = Sanitizer::escapeClass( 'mw-changeslist-log-' . $logType );
 		} else {
+			$classes[] = 'mw-changeslist-edit';
 			$classes[] = Sanitizer::escapeClass( 'mw-changeslist-ns' .
 				$rcObj->mAttribs['rc_namespace'] . '-' . $rcObj->mAttribs['rc_title'] );
 		}
@@ -691,8 +701,15 @@ class EnhancedChangesList extends ChangesList {
 			return $key === 'class' || Sanitizer::isReservedDataAttribute( $key );
 		} );
 
+		$prefix = '';
+		if ( is_callable( $this->changeLinePrefixer ) ) {
+			$prefix = call_user_func( $this->changeLinePrefixer, $rcObj, $this, false );
+		}
+
 		$line = Html::openElement( 'table', $attribs ) . Html::openElement( 'tr' );
-		$line .= '<td class="mw-enhanced-rc"><span class="mw-enhancedchanges-arrow-space"></span>';
+		$line .= Html::rawElement( 'td', [], '<span class="mw-enhancedchanges-arrow-space"></span>' );
+		$line .= Html::rawElement( 'td', [ 'class' => 'mw-changeslist-line-prefix' ], $prefix );
+		$line .= '<td class="mw-enhanced-rc">';
 
 		if ( isset( $data['recentChangesFlags'] ) ) {
 			$line .= $this->recentChangesFlags( $data['recentChangesFlags'] );
@@ -703,7 +720,12 @@ class EnhancedChangesList extends ChangesList {
 			$line .= '&#160;' . $data['timestampLink'];
 			unset( $data['timestampLink'] );
 		}
-		$line .= '&#160;</td><td>';
+		$line .= '&#160;</td>';
+		$line .= Html::openElement( 'td', [
+			'class' => 'mw-changeslist-line-inner',
+			// Used for reliable determination of the affiliated page
+			'data-target-page' => $rcObj->getTitle(),
+		] );
 
 		// everything else: makes it easier for extensions to add or remove data
 		$line .= implode( '', $data );