Merge branch 'archwiki'

# Conflicts:
#	skins/ArchLinux.php
#	skins/ArchLinux/archlogo.gif

1 files changed, 11 insertions, 3 deletions

diff --git a/extensions/ConfirmEdit/ConfirmEditHooks.php b/extensions/ConfirmEdit/ConfirmEditHooks.php
index bc85138d..af8b9c44 100644
--- a/extensions/ConfirmEdit/ConfirmEditHooks.php
+++ b/extensions/ConfirmEdit/ConfirmEditHooks.php
@@ -4,7 +4,7 @@ class ConfirmEditHooks {
 	/**
 	 * Get the global Captcha instance
 	 *
-	 * @return Captcha|SimpleCaptcha
+	 * @return SimpleCaptcha
 	 */
 	static function getInstance() {
 		global $wgCaptcha, $wgCaptchaClass;
@@ -26,13 +26,21 @@ class ConfirmEditHooks {
 	static function confirmEditAPI( $editPage, $newtext, &$resultArr ) {
 		return self::getInstance()->confirmEditAPI( $editPage, $newtext, $resultArr );
 	}
+	
+	static function addNewAccountApiForm( $apiModule, $loginForm ) {
+		return self::getInstance()->addNewAccountApiForm( $apiModule, $loginForm );
+	}
+	
+	static function addNewAccountApiResult( $apiModule, $loginPage, &$result ) {
+		return self::getInstance()->addNewAccountApiResult( $apiModule, $loginPage, $result );
+	}
 
 	static function injectUserCreate( &$template ) {
 		return self::getInstance()->injectUserCreate( $template );
 	}
 
-	static function confirmUserCreate( $u, &$message ) {
-		return self::getInstance()->confirmUserCreate( $u, $message );
+	static function confirmUserCreate( $u, &$message, &$status = null ) {
+		return self::getInstance()->confirmUserCreate( $u, $message, $status );
 	}
 
 	static function triggerUserLogin( $user, $password, $retval ) {