logging: Simplify DeleteLogFormatter b/c check
authorAaron Schulz <aschulz@wikimedia.org>
Fri, 27 May 2016 21:15:47 +0000 (14:15 -0700)
committerKrinkle <krinklemail@gmail.com>
Fri, 3 Jun 2016 22:09:37 +0000 (22:09 +0000)
Change-Id: Iab16663579d2eece4a94f80f7120b231aed0e572

includes/logging/DeleteLogFormatter.php

index 012d53c..f9b7875 100644 (file)
@@ -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();
                                }