only get the title string if action is not empty

[lhc/web/wiklou.git] / includes / SpecialUnlockdb.php

diff --git a/includes/SpecialUnlockdb.php b/includes/SpecialUnlockdb.php
index ca8daed..589f89f 100644 (file)
--- a/includes/SpecialUnlockdb.php
+++ b/includes/SpecialUnlockdb.php
@@ -2,12 +2,13 @@
 
 function wfSpecialUnlockdb()
 {
-       global $wgUser, $wgOut, $action;
+       global $wgUser, $wgOut, $wgRequest;
 
        if ( ! $wgUser->isDeveloper() ) {
                $wgOut->developerRequired();
                return;
        }
+       $action = $wgRequest->getText( 'action' );
        $f = new DBUnlockForm();
 
        if ( "success" == $action ) { $f->showSuccess(); }
@@ -16,11 +17,9 @@ function wfSpecialUnlockdb()
 }
 
 class DBUnlockForm {
-
        function showForm( $err )
        {
                global $wgOut, $wgUser, $wgLang;
-               global $wpLockConfirm;
 
                $wgOut->setPagetitle( wfMsg( "unlockdb" ) );
                $wgOut->addWikiText( wfMsg( "unlockdbtext" ) );
@@ -31,8 +30,8 @@ class DBUnlockForm {
                }
                $lc = wfMsg( "unlockconfirm" );
                $lb = wfMsg( "unlockbtn" );
-               $action = wfLocalUrlE( $wgLang->specialPage( "Unlockdb" ),
-                 "action=submit" );
+               $titleObj = Title::makeTitle( NS_SPECIAL, "Unlockdb" );
+               $action = $titleObj->escapeLocalURL( "action=submit" );
 
                $wgOut->addHTML( "<p>
 <form id=\"unlockdb\" method=\"post\" action=\"{$action}\">
@@ -52,8 +51,9 @@ class DBUnlockForm {
        function doSubmit()
        {
                global $wgOut, $wgUser, $wgLang;
-               global $wpLockConfirm, $wgReadOnlyFile;
+               global $wgRequest, $wgReadOnlyFile;
 
+               $wpLockConfirm = $wgRequest->getCheck( 'wpLockConfirm' );
                if ( ! $wpLockConfirm ) {
                        $this->showForm( wfMsg( "locknoconfirm" ) );
                        return;
@@ -62,8 +62,8 @@ class DBUnlockForm {
                        $wgOut->fileDeleteError( $wgReadOnlyFile );
                        return;
                }
-               $success = wfLocalUrl( $wgLang->specialPage( "Unlockdb" ),
-                 "action=success" );
+               $titleObj = Title::makeTitle( NS_SPECIAL, "Unlockdb" );
+               $success = $titleObj->getFullURL( "action=success" );
                $wgOut->redirect( $success );
        }