Fix undefined variable in SpecialMergeHistory
authorglaisher <glaisher.wiki@gmail.com>
Tue, 21 Apr 2015 05:20:16 +0000 (10:20 +0500)
committerglaisher <glaisher.wiki@gmail.com>
Tue, 21 Apr 2015 05:20:16 +0000 (10:20 +0500)
Bug: T96026
Change-Id: I7fa9fbd279dd6ec71f18614376386c1e2cad9728

includes/specials/SpecialMergeHistory.php

index 368d491..b6cf8e4 100644 (file)
@@ -152,7 +152,7 @@ class SpecialMergeHistory extends SpecialPage {
 
                if ( count( $errors ) ) {
                        $this->showMergeForm();
 
                if ( count( $errors ) ) {
                        $this->showMergeForm();
-                       $out->addHTML( implode( "\n", $errors ) );
+                       $this->getOutput()->addHTML( implode( "\n", $errors ) );
                } else {
                        $this->showHistory();
                }
                } else {
                        $this->showHistory();
                }