X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Flogging%2FDeleteLogFormatter.php;h=8b30e9ba94bb443ce23756797388345358996abb;hb=0df899b79d0d350c7f7acac3e3d7052b7a170891;hp=d761a8720f61cbd30ad1f183bf823dd64008eab2;hpb=ddff639b7566f72f0c2dda302280de2ee6774b7f;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/logging/DeleteLogFormatter.php b/includes/logging/DeleteLogFormatter.php
index d761a8720f..8b30e9ba94 100644
--- a/includes/logging/DeleteLogFormatter.php
+++ b/includes/logging/DeleteLogFormatter.php
@@ -48,13 +48,14 @@ class DeleteLogFormatter extends LogFormatter {
 		$params = parent::getMessageParameters();
 		$subtype = $this->entry->getSubtype();
 		if ( in_array( $subtype, array( 'event', 'revision' ) ) ) {
-			// $params[3] here is 'revision' for page revisions, 'oldimage' for
-			// file versions, or a comma-separated list of log_ids for log
+			// $params[3] here is 'revision' or 'archive' for page revisions, 'oldimage' or
+			// 'filearchive' for file versions, or a comma-separated list of log_ids for log
 			// entries. $subtype here is 'revision' for page revisions and file
 			// versions, or 'event' for log entries.
 			if ( ( $subtype === 'event' && count( $params ) === 6 )
 				|| ( $subtype === 'revision' && isset( $params[3] )
-					&& ( $params[3] === 'revision' || $params[3] === 'oldimage' )
+					&& ( $params[3] === 'revision' || $params[3] === 'oldimage'
+						|| $params[3] === 'archive' || $params[3] === 'filearchive' )
 				)
 			) {
 				$paramStart = $subtype === 'revision' ? 4 : 3;
@@ -63,9 +64,11 @@ class DeleteLogFormatter extends LogFormatter {
 				$new = $this->parseBitField( $params[$paramStart + 2] );
 				list( $hid, $unhid, $extra ) = RevisionDeleter::getChanges( $new, $old );
 				$changes = array();
+				// messages used: revdelete-content-hid, revdelete-summary-hid, revdelete-uname-hid
 				foreach ( $hid as $v ) {
 					$changes[] = $this->msg( "$v-hid" )->plain();
 				}
+				// messages used: revdelete-content-unhid, revdelete-summary-unhid, revdelete-uname-unhid
 				foreach ( $unhid as $v ) {
 					$changes[] = $this->msg( "$v-unhid" )->plain();
 				}
@@ -79,13 +82,16 @@ class DeleteLogFormatter extends LogFormatter {
 				$count = count( explode( ',', $params[$paramStart] ) );
 				$newParams[4] = $this->context->getLanguage()->formatNum( $count );
 
-				return $this->parsedParametersDeleteLog = $newParams;
+				$this->parsedParametersDeleteLog = $newParams;
+				return $this->parsedParametersDeleteLog;
 			} else {
-				return $this->parsedParametersDeleteLog = array_slice( $params, 0, 3 );
+				$this->parsedParametersDeleteLog = array_slice( $params, 0, 3 );
+				return $this->parsedParametersDeleteLog;
 			}
 		}
 
-		return $this->parsedParametersDeleteLog = $params;
+		$this->parsedParametersDeleteLog = $params;
+		return $this->parsedParametersDeleteLog;
 	}
 
 	protected function parseBitField( $string ) {