From: umherirrender <umherirrender_de.wp@web.de>
Date: Sat, 12 Apr 2014 22:08:58 +0000 (+0200)
Subject: Format archive and filearchive revision delete log entries
X-Git-Tag: 1.31.0-rc.0~16238
X-Git-Url: http://git.cyclocoop.org/url?a=commitdiff_plain;h=4ae5fb99b04964222de40ebf666f7b17ebac789a;p=lhc%2Fweb%2Fwiklou.git

Format archive and filearchive revision delete log entries

DeleteLogFormatter only checks for revision and oldimage, but it is also
possible to delete archived revisions or archived files, so also check
for these types to have better formatted log entries.

Change-Id: I3f8eaa3956e2c7fc216fb4030fe4bab6cb8bbd60
---

diff --git a/includes/logging/DeleteLogFormatter.php b/includes/logging/DeleteLogFormatter.php
index b658ac1ec6..b3905635f5 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;