Merge "Make unused variable optional in ChangesList::insertDiffHist"

diff --git a/includes/changes/ChangesList.php b/includes/changes/ChangesList.php
index 637eb88..cf97afb 100644 (file)
--- a/includes/changes/ChangesList.php
+++ b/includes/changes/ChangesList.php
@@ -344,9 +344,9 @@ class ChangesList extends ContextSource {
        /**
         * @param string $s HTML to update
         * @param RecentChange $rc
-        * @param bool $unpatrolled
+        * @param bool|null $unpatrolled Unused variable, since 1.27.
         */
-       public function insertDiffHist( &$s, &$rc, $unpatrolled ) {
+       public function insertDiffHist( &$s, &$rc, $unpatrolled = null ) {
                # Diff link
                if (
                        $rc->mAttribs['rc_type'] == RC_NEW ||

diff --git a/includes/changes/OldChangesList.php b/includes/changes/OldChangesList.php
index 576718a..8eb06ce 100644 (file)
--- a/includes/changes/OldChangesList.php
+++ b/includes/changes/OldChangesList.php
@@ -87,7 +87,7 @@ class OldChangesList extends ChangesList {
                        }
                // Regular entries
                } else {
-                       $this->insertDiffHist( $html, $rc, $unpatrolled );
+                       $this->insertDiffHist( $html, $rc );
                        # M, N, b and ! (minor, new, bot and unpatrolled)
                        $html .= $this->recentChangesFlags(
                                [