Merge "SpecialLockdb and SpecialUnlockdb don't do database writes"

diff --combined includes/specials/SpecialLockdb.php
index 37494c5,b759991..2d087ca
--- 1/includes/specials/SpecialLockdb.php
--- 2/includes/specials/SpecialLockdb.php
+++ b/includes/specials/SpecialLockdb.php
@@@ -34,7 -34,7 +34,7 @@@ class SpecialLockdb extends FormSpecial
        }
  
        public function doesWrites() {
-               return true;
+               return false;
        }
  
        public function requiresWrite() {
@@@ -47,9 -47,6 +47,9 @@@
                if ( !is_writable( dirname( $this->getConfig()->get( 'ReadOnlyFile' ) ) ) ) {
                        throw new ErrorPageError( 'lockdb', 'lockfilenotwritable' );
                }
 +              if ( file_exists( $this->getConfig()->get( 'ReadOnlyFile' ) ) ) {
 +                      throw new ErrorPageError( 'lockdb', 'databaselocked' );
 +              }
        }
  
        protected function getFormFields() {
@@@ -68,9 -65,9 +68,9 @@@
        }
  
        protected function alterForm( HTMLForm $form ) {
 -              $form->setWrapperLegend( false );
 -              $form->setHeaderText( $this->msg( 'lockdbtext' )->parseAsBlock() );
 -              $form->setSubmitTextMsg( 'lockbtn' );
 +              $form->setWrapperLegend( false )
 +                      ->setHeaderText( $this->msg( 'lockdbtext' )->parseAsBlock() )
 +                      ->setSubmitTextMsg( 'lockbtn' );
        }
  
        public function onSubmit( array $data ) {
@@@ -108,10 -105,6 +108,10 @@@
                $out->addWikiMsg( 'lockdbsuccesstext' );
        }
  
 +      protected function getDisplayFormat() {
 +              return 'ooui';
 +      }
 +
        protected function getGroupName() {
                return 'wiki';
        }

diff --combined includes/specials/SpecialUnlockdb.php
index 474c3af,4cfba84..8cd86ce
--- 1/includes/specials/SpecialUnlockdb.php
--- 2/includes/specials/SpecialUnlockdb.php
+++ b/includes/specials/SpecialUnlockdb.php
@@@ -33,7 -33,7 +33,7 @@@ class SpecialUnlockdb extends FormSpeci
        }
  
        public function doesWrites() {
-               return true;
+               return false;
        }
  
        public function requiresWrite() {
@@@ -58,9 -58,9 +58,9 @@@
        }
  
        protected function alterForm( HTMLForm $form ) {
 -              $form->setWrapperLegend( false );
 -              $form->setHeaderText( $this->msg( 'unlockdbtext' )->parseAsBlock() );
 -              $form->setSubmitTextMsg( 'unlockbtn' );
 +              $form->setWrapperLegend( false )
 +                      ->setHeaderText( $this->msg( 'unlockdbtext' )->parseAsBlock() )
 +                      ->setSubmitTextMsg( 'unlockbtn' );
        }
  
        public function onSubmit( array $data ) {
@@@ -86,10 -86,6 +86,10 @@@
                $out->addWikiMsg( 'unlockdbsuccesstext' );
        }
  
 +      protected function getDisplayFormat() {
 +              return 'ooui';
 +      }
 +
        protected function getGroupName() {
                return 'wiki';
        }