Merge "Make unused variable optional in ChangesList::insertDiffHist"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 15 Mar 2016 14:52:56 +0000 (14:52 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 15 Mar 2016 14:52:56 +0000 (14:52 +0000)
1  2 
includes/changes/ChangesList.php
includes/changes/OldChangesList.php

Simple merge
@@@ -87,10 -92,10 +87,10 @@@ class OldChangesList extends ChangesLis
                        }
                // Regular entries
                } else {
-                       $this->insertDiffHist( $html, $rc, $unpatrolled );
+                       $this->insertDiffHist( $html, $rc );
                        # M, N, b and ! (minor, new, bot and unpatrolled)
                        $html .= $this->recentChangesFlags(
 -                              array(
 +                              [
                                        'newpage' => $rc->mAttribs['rc_type'] == RC_NEW,
                                        'minor' => $rc->mAttribs['rc_minor'],
                                        'unpatrolled' => $unpatrolled,