* Preserve entered reason when reporting unconfirmed lock on Special:Lockdb

* Alter default "lockdbsuccesstext" message to link to Special:Unlockdb

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 1d2c8ab..8079a0d 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -58,6 +58,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 6635) Fix regression searching for range blocks on Ipblocklist
 * Fix regression searching Ipblocklist with ugly URLs
 * (bug 6639) Use a consistent default for upload directories
+* Preserve entered reason when reporting unconfirmed lock on Special:Lockdb
 
 == Languages updated ==
 

diff --git a/includes/SpecialLockdb.php b/includes/SpecialLockdb.php
index 8c58373..72172e2 100644 (file)
--- a/includes/SpecialLockdb.php
+++ b/includes/SpecialLockdb.php
@@ -64,12 +64,13 @@ class DBLockForm {
                $elr = htmlspecialchars( wfMsg( 'enterlockreason' ) );
                $titleObj = Title::makeTitle( NS_SPECIAL, 'Lockdb' );
                $action = $titleObj->escapeLocalURL( 'action=submit' );
+               $reason = htmlspecialchars( $this->reason );
                $token = htmlspecialchars( $wgUser->editToken() );
 
                $wgOut->addHTML( <<<END
 <form id="lockdb" method="post" action="{$action}">
 {$elr}:
-<textarea name="wpLockReason" rows="10" cols="60" wrap="virtual"></textarea>
+<textarea name="wpLockReason" rows="10" cols="60" wrap="virtual">{$reason}</textarea>
 <table border="0">
        <tr>
                <td align="right">

diff --git a/languages/Messages.php b/languages/Messages.php
index 060107d..7f752b9 100644 (file)
--- a/languages/Messages.php
+++ b/languages/Messages.php
@@ -1343,7 +1343,7 @@ Please confirm that this is what you intend to do.',
 'lockdbsuccesssub' => 'Database lock succeeded',
 'unlockdbsuccesssub' => 'Database lock removed',
 'lockdbsuccesstext' => 'The database has been locked.
-<br />Remember to remove the lock after your maintenance is complete.',
+<br />Remember to [[Special:Unlockdb|remove the lock]] after your maintenance is complete.',
 'unlockdbsuccesstext' => 'The database has been unlocked.',
 'lockfilenotwritable' => 'The database lock file is not writable. To lock or unlock the database, this needs to be writable by the web server.',