Merge "SkinTemplate: extract formatLanguageName() from outputPage()"

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

diff --git a/includes/specials/SpecialUnlockdb.php b/includes/specials/SpecialUnlockdb.php
index 115e617..2e77254 100644 (file)
--- a/includes/specials/SpecialUnlockdb.php
+++ b/includes/specials/SpecialUnlockdb.php
@@ -36,11 +36,11 @@ class SpecialUnlockdb extends FormSpecialPage {
                return false;
        }
 
-       public function userCanExecute( User $user ) {
-               parent::userCanExecute( $user );
+       public function checkExecutePermissions( User $user ) {
+               global $wgReadOnlyFile;
 
+               parent::checkExecutePermissions( $user );
                # If the lock file isn't writable, we can do sweet bugger all
-               global $wgReadOnlyFile;
                if ( !file_exists( $wgReadOnlyFile ) ) {
                        throw new ErrorPageError( 'lockdb', 'databasenotlocked' );
                }
@@ -81,7 +81,7 @@ class SpecialUnlockdb extends FormSpecialPage {
 
        public function onSuccess() {
                $out = $this->getOutput();
-               $out->setSubtitle( wfMsg( 'unlockdbsuccesssub' ) );
+               $out->addSubtitle( $this->msg( 'unlockdbsuccesssub' ) );
                $out->addWikiMsg( 'unlockdbsuccesstext' );
        }
 }