From c4372dd38a4d109b4f3881ea63b667e33adbe503 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Thu, 26 Apr 2012 18:23:31 +0200
Subject: Update to MediaWiki 1.18.3

---
 extensions/ConfirmEdit/ConfirmEditHooks.php | 37 ++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 14 deletions(-)

(limited to 'extensions/ConfirmEdit/ConfirmEditHooks.php')

diff --git a/extensions/ConfirmEdit/ConfirmEditHooks.php b/extensions/ConfirmEdit/ConfirmEditHooks.php
index dcdf49f7..66e51991 100644
--- a/extensions/ConfirmEdit/ConfirmEditHooks.php
+++ b/extensions/ConfirmEdit/ConfirmEditHooks.php
@@ -1,24 +1,22 @@
 <?php
 
 class ConfirmEditHooks {
-
 	/**
 	 * Get the global Captcha instance
 	 *
-	 * @return Captcha
+	 * @return Captcha|SimpleCaptcha
 	 */
 	static function getInstance() {
 		global $wgCaptcha, $wgCaptchaClass;
+
 		static $done = false;
+
 		if ( !$done ) {
 			$done = true;
 			$wgCaptcha = new $wgCaptchaClass;
 		}
-		return $wgCaptcha;
-	}
 
-	static function confirmEdit( $editPage, $newtext, $section ) {
-		return self::getInstance()->confirmEdit( $editPage, $newtext, $section );
+		return $wgCaptcha;
 	}
 
 	static function confirmEditMerged( $editPage, $newtext ) {
@@ -56,23 +54,34 @@ class ConfirmEditHooks {
 	static function confirmEmailUser( $from, $to, $subject, $text, &$error ) {
 		return self::getInstance()->confirmEmailUser( $from, $to, $subject, $text, $error );
 	}
+
+	public static function APIGetAllowedParams( &$module, &$params ) {
+		return self::getInstance()->APIGetAllowedParams( $module, $params );
+	}
+
+	public static function APIGetParamDescription( &$module, &$desc ) {
+		return self::getInstance()->APIGetParamDescription( $module, $desc );
+	}
 }
 
 class CaptchaSpecialPage extends UnlistedSpecialPage {
-	public function __construct(){
+	public function __construct() {
 		parent::__construct( 'Captcha' );
 	}
+
 	function execute( $par ) {
 		$this->setHeaders();
+
 		$instance = ConfirmEditHooks::getInstance();
+
 		switch( $par ) {
-		case "image":
-			if ( method_exists( $instance, 'showImage' ) )
-				return $instance->showImage();
-		case "help":
-		default:
-			return $instance->showHelp();
+			case "image":
+				if ( method_exists( $instance, 'showImage' ) ) {
+					return $instance->showImage();
+				}
+			case "help":
+			default:
+				return $instance->showHelp();
 		}
 	}
 }
-
-- 
cgit v1.2.3-54-g00ecf