From 28f90f8f46878820589d8764af67737410337a3f Mon Sep 17 00:00:00 2001 From: glaisher Date: Tue, 21 Apr 2015 10:20:16 +0500 Subject: [PATCH] Fix undefined variable in SpecialMergeHistory Bug: T96026 Change-Id: I7fa9fbd279dd6ec71f18614376386c1e2cad9728 --- includes/specials/SpecialMergeHistory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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(); } -- 2.20.1