REVERT: Bug 3835: add a cancel link on special:movepage

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 55b3ac9..e08d388 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -287,7 +287,6 @@ Special Pages:
 * (bug 4359) red [[user:#id]] links generated in [[special:Log]]
 * (bug 1996) Special page to list redirects
 * (bug 4334) Add "watch" links to Special:Unwatchedpages
-* (bug 3835) Add a 'Cancel' backlink on Special:Movepage
 
 Misc.:
 * PHP 4.1 compatibility fix: don't use new_link parameter to mysql_connect

diff --git a/includes/SpecialMovepage.php b/includes/SpecialMovepage.php
index 6dff709..bfc2af9 100644 (file)
--- a/includes/SpecialMovepage.php
+++ b/includes/SpecialMovepage.php
@@ -116,9 +116,6 @@ class MovePageForm {
                $movetalk = wfMsgHtml( 'movetalk' );
                $movereason = wfMsgHtml( 'movereason' );
 
-               $sk =& $wgUser->getSkin();
-               $cancel = $sk->makeKnownLink( $oldTitle, wfMsg('cancel') );
-
                $titleObj = Title::makeTitle( NS_SPECIAL, 'Movepage' );
                $action = $titleObj->escapeLocalURL( 'action=submit' );
                $token = htmlspecialchars( $wgUser->editToken() );
@@ -166,7 +163,6 @@ class MovePageForm {
                        <td>&nbsp;</td>
                        <td align='left'>
                                <input type='submit' name=\"{$submitVar}\" value=\"{$movepagebtn}\" />
-                               {$cancel}
                        </td>
                </tr>
        </table>