From: Chad Horohoe <demon@users.mediawiki.org>
Date: Fri, 19 Mar 2010 21:18:11 +0000 (+0000)
Subject: Followup r63914, function must match parent
X-Git-Tag: 1.31.0-rc.0~37413
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=681970b0d9d528190271bb997340cd21834865b6;p=lhc%2Fweb%2Fwiklou.git

Followup r63914, function must match parent
---

diff --git a/includes/specials/SpecialMergeHistory.php b/includes/specials/SpecialMergeHistory.php
index 6d2ea3b988..59c924ccc0 100644
--- a/includes/specials/SpecialMergeHistory.php
+++ b/includes/specials/SpecialMergeHistory.php
@@ -51,7 +51,7 @@ class SpecialMergeHistory extends SpecialPage {
 		}
 	}
 
-	function execute( $par = '' ) {
+	function execute( $par ) {
 		global $wgOut, $wgRequest, $wgUser;
 
 		if( !$this->userCanExecute( $wgUser ) ) {