Basic compatibility between tables: When deleting the old redirect (when moving over...

diff --git a/includes/SpecialMovepage.php b/includes/SpecialMovepage.php
index 7a003bb..6bbe496 100644 (file)
--- a/includes/SpecialMovepage.php
+++ b/includes/SpecialMovepage.php
@@ -276,7 +276,7 @@ class MovePageForm {
                  '&newtitle=' . wfUrlencode( $nt->getPrefixedText() ) .
                  '&talkmoved='.$talkmoved );
 
-               $wgOut->redirect( $success );
+               #$wgOut->redirect( $success );
        }
 
        function showSuccess() {

diff --git a/includes/Title.php b/includes/Title.php
index decf6e7..ad7cc54 100644 (file)
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -2465,6 +2465,19 @@ class Title {
                # We have to remove it so that the next step doesn't trigger
                # a conflict on the unique namespace+title index...
                $dbw->delete( 'page', array( 'page_id' => $newid ), $fname );
+               if ( !$dbw->cascadingDeletes() ) {
+                       $dbw->delete( 'revision', array( 'rev_page' => $newid ), __METHOD__ );
+                       global $wgUseTrackbacks;
+                       if ($wgUseTrackbacks)
+                               $dbw->delete( 'trackbacks', array( 'tb_page' => $newid ), __METHOD__ );
+                       $dbw->delete( 'pagelinks', array( 'pl_from' => $newid ), __METHOD__ );
+                       $dbw->delete( 'imagelinks', array( 'il_from' => $newid ), __METHOD__ );
+                       $dbw->delete( 'categorylinks', array( 'cl_from' => $newid ), __METHOD__ );
+                       $dbw->delete( 'templatelinks', array( 'tl_from' => $newid ), __METHOD__ );
+                       $dbw->delete( 'externallinks', array( 'el_from' => $newid ), __METHOD__ );
+                       $dbw->delete( 'langlinks', array( 'll_from' => $newid ), __METHOD__ );
+                       $dbw->delete( 'redirect', array( 'rd_from' => $newid ), __METHOD__ );
+               }
 
                # Save a null revision in the page's history notifying of the move
                $nullRevision = Revision::newNullRevision( $dbw, $oldid, $comment, true );