From: Aaron Schulz <aschulz@wikimedia.org>
Date: Fri, 27 May 2016 21:15:47 +0000 (-0700)
Subject: logging: Simplify DeleteLogFormatter b/c check
X-Git-Tag: 1.31.0-rc.0~6717
X-Git-Url: http://git.cyclocoop.org/%7B%7B%20url_for%28%27admin_vote_add%27%29%20%7D%7D?a=commitdiff_plain;h=057abe72a5c38dc1dee2a4e2e7d456ddb881f977;p=lhc%2Fweb%2Fwiklou.git

logging: Simplify DeleteLogFormatter b/c check

Change-Id: Iab16663579d2eece4a94f80f7120b231aed0e572
---

diff --git a/includes/logging/DeleteLogFormatter.php b/includes/logging/DeleteLogFormatter.php
index 012d53c9a2..f9b7875d86 100644
--- a/includes/logging/DeleteLogFormatter.php
+++ b/includes/logging/DeleteLogFormatter.php
@@ -54,10 +54,11 @@ class DeleteLogFormatter extends LogFormatter {
 			// '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] === 'archive' || $params[3] === 'filearchive' )
+			if (
+				( $subtype === 'event' && count( $params ) === 6 )
+				|| (
+					$subtype === 'revision' && isset( $params[3] )
+					&& in_array( $params[3], [ 'revision', 'archive', 'oldimage', 'filearchive' ] )
 				)
 			) {
 				$paramStart = $subtype === 'revision' ? 4 : 3;
@@ -70,7 +71,8 @@ class DeleteLogFormatter extends LogFormatter {
 				foreach ( $hid as $v ) {
 					$changes[] = $this->msg( "$v-hid" )->plain();
 				}
-				// messages used: revdelete-content-unhid, revdelete-summary-unhid, revdelete-uname-unhid
+				// messages used: revdelete-content-unhid, revdelete-summary-unhid,
+				// revdelete-uname-unhid
 				foreach ( $unhid as $v ) {
 					$changes[] = $this->msg( "$v-unhid" )->plain();
 				}