Maintenance for ConfirmEdit extension.
[toast/cookiecaptcha.git] / QuestyCaptcha.class.php
index 8e87db3051a26622b7f126b1941c08955cf1f80f..93954f1ee5e6ce4595160583fa8bb3fa1d638455 100644 (file)
@@ -55,18 +55,18 @@ class QuestyCaptcha extends SimpleCaptcha {
 
        function getMessage( $action ) {
                $name = 'questycaptcha-' . $action;
-               $text = wfMsg( $name );
+               $text = wfMessage( $name )->text();
                # Obtain a more tailored message, if possible, otherwise, fall back to
                # the default for edits
-               return wfEmptyMsg( $name, $text ) ? wfMsg( 'questycaptcha-edit' ) : $text;
+               return wfMessage( $name, $text )->isDisabled() ? wfMessage( 'questycaptcha-edit' )->text() : $text;
        }
 
        function showHelp() {
                global $wgOut;
-               $wgOut->setPageTitle( wfMsg( 'captchahelp-title' ) );
-               $wgOut->addWikiText( wfMsg( 'questycaptchahelp-text' ) );
+               $wgOut->setPageTitle( wfMessage( 'captchahelp-title' )->text() );
+               $wgOut->addWikiMsg( 'questycaptchahelp-text' );
                if ( CaptchaStore::get()->cookiesNeeded() ) {
-                       $wgOut->addWikiText( wfMsg( 'captchahelp-cookies-needed' ) );
+                       $wgOut->addWikiMsg( 'captchahelp-cookies-needed' );
                }
        }
 }