From: glaisher <glaisher.wiki@gmail.com>
Date: Tue, 21 Apr 2015 05:20:16 +0000 (+0500)
Subject: Fix undefined variable in SpecialMergeHistory
X-Git-Tag: 1.31.0-rc.0~11646^2
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/cotisations/gestion/rappel_modifier.php?a=commitdiff_plain;h=28f90f8f46878820589d8764af67737410337a3f;p=lhc%2Fweb%2Fwiklou.git

Fix undefined variable in SpecialMergeHistory

Bug: T96026
Change-Id: I7fa9fbd279dd6ec71f18614376386c1e2cad9728
---

diff --git a/includes/specials/SpecialMergeHistory.php b/includes/specials/SpecialMergeHistory.php
index 368d4919d1..b6cf8e445a 100644
--- a/includes/specials/SpecialMergeHistory.php
+++ b/includes/specials/SpecialMergeHistory.php
@@ -152,7 +152,7 @@ class SpecialMergeHistory extends SpecialPage {
 
 		if ( count( $errors ) ) {
 			$this->showMergeForm();
-			$out->addHTML( implode( "\n", $errors ) );
+			$this->getOutput()->addHTML( implode( "\n", $errors ) );
 		} else {
 			$this->showHistory();
 		}