bug 1004 Capitalized Norsk
[lhc/web/wiklou.git] / includes / SpecialUndelete.php
index e504b31..d450960 100644 (file)
 <?php
+/**
+ *
+ * @package MediaWiki
+ * @subpackage SpecialPage
+ */
 
-function wfSpecialUndelete( $par )
-{
+/**
+ *
+ */
+function wfSpecialUndelete( $par ) {
     global $wgRequest;
 
        $form = new UndeleteForm( $wgRequest, $par );
        $form->execute();
 }
 
+/**
+ *
+ * @package MediaWiki
+ * @subpackage SpecialPage
+ */
+class PageArchive {
+       var $title;
+       
+       function PageArchive( &$title ) {
+               if( is_null( $title ) ) {
+                       wfDebugDieBacktrace( 'Archiver() given a null title.');
+               }
+               $this->title =& $title;
+       }
+       
+       /**
+        * List all deleted pages recorded in the archive table. Returns result
+        * wrapper with (ar_namespace, ar_title, count) fields, ordered by page
+        * namespace/title. Can be called staticaly.
+        *
+        * @return ResultWrapper
+        */
+       /* static */ function &listAllPages() {
+               $dbr =& wfGetDB( DB_SLAVE );
+               $archive = $dbr->tableName( 'archive' );
+
+               $sql = "SELECT ar_namespace,ar_title, COUNT(*) AS count FROM $archive " . 
+                 "GROUP BY ar_namespace,ar_title ORDER BY ar_namespace,ar_title";
+
+               return $dbr->resultObject( $dbr->query( $sql, 'PageArchive::listAllPages' ) );
+       }
+       
+       /**
+        * List the revisions of the given page. Returns result wrapper with
+        * (ar_minor_edit, ar_timestamp, ar_user, ar_user_text, ar_comment) fields.
+        *
+        * @return ResultWrapper
+        */
+       function &listRevisions() {
+               $dbr =& wfGetDB( DB_SLAVE );
+               return $dbr->resultObject( $dbr->select( 'archive',
+                       array( 'ar_minor_edit', 'ar_timestamp', 'ar_user', 'ar_user_text', 'ar_comment' ),
+                       array( 'ar_namespace' => $this->title->getNamespace(),
+                              'ar_title' => $this->title->getDBkey() ),
+                       'PageArchive::listRevisions',
+                       array( 'ORDER BY' => 'ar_timestamp DESC' ) ) );
+       }
+       
+       /**
+        * Fetch (and decompress if necessary) the stored text for the deleted
+        * revision of the page with the given timestamp.
+        *
+        * @return string
+        */
+       function getRevisionText( $timestamp ) {
+               $dbr =& wfGetDB( DB_SLAVE );
+               $row = $dbr->selectRow( 'archive',
+                       array( 'ar_text', 'ar_flags' ),
+                       array( 'ar_namespace' => $this->title->getNamespace(),
+                              'ar_title' => $this->title->getDbkey(),
+                              'ar_timestamp' => $dbr->timestamp( $timestamp ) ) );
+               return Article::getRevisionText( $row, "ar_" );
+       }
+       
+       /**
+        * Fetch (and decompress if necessary) the stored text of the most
+        * recently edited deleted revision of the page.
+        *
+        * If there are no archived revisions for the page, returns NULL.
+        *
+        * @return string
+        */
+       function getLastRevisionText() {
+               $dbr =& wfGetDB( DB_SLAVE );
+               $row = $dbr->selectRow( 'archive',
+                       array( 'ar_text', 'ar_flags' ),
+                       array( 'ar_namespace' => $this->title->getNamespace(),
+                              'ar_title' => $this->title->getDBkey() ),
+                       'PageArchive::getLastRevisionText',
+                       'ORDER BY ar_timestamp DESC LIMIT 1' );
+               if( $row ) {
+                       return Article::getRevisionText( $row, "ar_" );
+               } else {
+                       return NULL;
+               }
+       }
+       
+       /**
+        * Quick check if any archived revisions are present for the page.
+        * @return bool
+        */
+       function isDeleted() {
+               $dbr =& wfGetDB( DB_SLAVE );
+               $n = $dbr->selectField( 'archive', 'COUNT(ar_title)',
+                       array( 'ar_namespace' => $this->title->getNamespace(),
+                              'ar_title' => $this->title->getDBkey() ) );
+               return ($n > 0);
+       }
+       
+       /**
+        * This is the meaty bit -- restores archived revisions of the given page
+        * to the cur/old tables. If the page currently exists, all revisions will
+        * be stuffed into old, otherwise the most recent will go into cur.
+        * The deletion log will be updated with an undeletion notice.
+        *
+        * Returns true on success.
+        *
+        * @param array $timestamps Pass an empty array to restore all revisions, otherwise list the ones to undelete.
+        * @return bool
+        */
+       function undelete( $timestamps ) {
+               global $wgUser, $wgOut, $wgLang, $wgDeferredUpdateList;
+               global $wgUseSquid, $wgInternalServer, $wgLinkCache;
+
+               $fname = "doUndeleteArticle";
+               $restoreAll = empty( $timestamps );
+               $restoreRevisions = count( $timestamps );
+
+               $dbw =& wfGetDB( DB_MASTER );
+               extract( $dbw->tableNames( 'cur', 'archive', 'old' ) );
+               $namespace = $this->title->getNamespace();
+               $ttl = $this->title->getDBkey();
+               $t = $dbw->strencode( $ttl );
+
+               # Move article and history from the "archive" table
+               $sql = "SELECT COUNT(*) AS count FROM $cur WHERE cur_namespace={$namespace} AND cur_title='{$t}'";
+               global $wgDBtype;
+               if( $wgDBtype != 'PostgreSQL' ) { # HACKHACKHACKHACK
+                       $sql .= ' FOR UPDATE';
+               }
+               $res = $dbw->query( $sql, $fname );
+               $row = $dbw->fetchObject( $res );
+               $now = wfTimestampNow();
+
+               if( $row->count == 0) {
+                       # Have to create new article...
+                       $sql = "SELECT ar_text,ar_comment,ar_user,ar_user_text,ar_timestamp,ar_minor_edit,ar_flags FROM $archive WHERE ar_namespace={$namespace} AND ar_title='{$t}' ";
+                       if( !$restoreAll ) {
+                               $max = $dbw->addQuotes( $dbw->timestamp( array_shift( $timestamps ) ) );
+                               $sql .= "AND ar_timestamp={$max} ";
+                       }
+                       $sql .= "ORDER BY ar_timestamp DESC LIMIT 1 FOR UPDATE";
+                       $res = $dbw->query( $sql, $fname );
+                       $s = $dbw->fetchObject( $res );
+                       if( $restoreAll ) {
+                               $max = $s->ar_timestamp;
+                       }
+                       $text = Article::getRevisionText( $s, "ar_" );
+                       
+                       $redirect = MagicWord::get( MAG_REDIRECT );
+                       $redir = $redirect->matchStart( $text ) ? 1 : 0;
+                       
+                       $rand = wfRandom();
+                       $dbw->insert( 'cur', array(
+                               'cur_id' => $dbw->nextSequenceValue( 'cur_cur_id_seq' ),
+                               'cur_namespace' => $namespace,
+                               'cur_title' => $ttl,
+                               'cur_text' => $text,
+                               'cur_comment' => $s->ar_comment,
+                               'cur_user' => $s->ar_user,
+                               'cur_timestamp' => $s->ar_timestamp,
+                               'cur_minor_edit' => $s->ar_minor_edit,
+                               'cur_user_text' => $s->ar_user_text,
+                               'cur_is_redirect' => $redir,
+                               'cur_random' => $rand,
+                               'cur_touched' => $dbw->timestamp( $now ),
+                               'inverse_timestamp' => wfInvertTimestamp( wfTimestamp( TS_MW, $s->ar_timestamp ) ),
+                       ), $fname );
+                       
+                       $newid = $dbw->insertId();
+                       if( $restoreAll ) {
+                               $oldones = "AND ar_timestamp<" . $dbw->addQuotes( $dbw->timestamp( $max ) );
+                       }
+               } else {
+                       # If already exists, put history entirely into old table
+                       $oldones = "";
+                       $newid = 0;
+                       
+                       # But to make the history list show up right, we need to touch it.
+                       $sql = "UPDATE $cur SET cur_touched='{$now}' WHERE cur_namespace={$namespace} AND cur_title='{$t}'";
+                       $dbw->query( $sql, $fname );
+                       
+                       # FIXME: Sometimes restored entries will be _newer_ than the current version.
+                       # We should merge.
+               }
+               
+               if( !$restoreAll ) {
+                       $oldts = array();
+                       foreach( $timestamps as $ts ) {
+                               array_push( $oldts, $dbw->addQuotes( $dbw->timestamp( $ts ) ) );
+                       }
+                       $oldts = join( ",", $oldts );
+                       $oldones = "AND ar_timestamp IN ( {$oldts} )";
+               }
+               $sql = "INSERT INTO $old (old_namespace,old_title,old_text," .
+                 "old_comment,old_user,old_user_text,old_timestamp,inverse_timestamp,old_minor_edit," .
+                 "old_flags) SELECT ar_namespace,ar_title,ar_text,ar_comment," .
+                 "ar_user,ar_user_text,ar_timestamp,99999999999999-ar_timestamp,ar_minor_edit,ar_flags " .
+                 "FROM $archive WHERE ar_namespace={$namespace} AND ar_title='{$t}' {$oldones}";
+               if( $restoreAll || !empty( $oldts ) ) {
+                       $dbw->query( $sql, $fname );
+               }
+
+               # Finally, clean up the link tables 
+               if( $newid ) {
+                       $wgLinkCache = new LinkCache();
+                       # Select for update
+                       $wgLinkCache->forUpdate( true );
+                       # Create a dummy OutputPage to update the outgoing links
+                       $dummyOut = new OutputPage();
+                       $dummyOut->addWikiText( $text );
+
+                       $u = new LinksUpdate( $newid, $this->title->getPrefixedDBkey() );
+                       array_push( $wgDeferredUpdateList, $u );
+                       
+                       Article::onArticleCreate( $this->title );
+
+                       #TODO: SearchUpdate, etc.
+               }
+
+               # Now that it's safely stored, take it out of the archive
+               $sql = "DELETE FROM $archive WHERE ar_namespace={$namespace} AND " .
+                 "ar_title='{$t}'";
+               if( !$restoreAll ) {
+                       $sql .= " AND ar_timestamp IN ( {$oldts}";
+                       if( $newid ) {
+                               if( !empty( $oldts ) ) $sql .= ",";
+                               $sql .= $max;
+                       }
+                       $sql .= ")";
+               }
+               $dbw->query( $sql, $fname );
+
+               
+               # Touch the log?
+               $log = new LogPage( 'delete' );
+               if( $restoreAll ) {
+                       $reason = "";
+               } else {
+                       $reason = wfMsg( 'undeletedrevisions', $restoreRevisions );
+               }
+               $log->addEntry( 'restore', $this->title, $reason );
+               
+               return true;
+       }
+}
+
+/**
+ *
+ * @package MediaWiki
+ * @subpackage SpecialPage
+ */
 class UndeleteForm {
        var $mAction, $mTarget, $mTimestamp, $mRestore, $mTargetObj;
+       var $mTargetTimestamp;
 
        function UndeleteForm( &$request, $par = "" ) {
                $this->mAction = $request->getText( 'action' );
                $this->mTarget = $request->getText( 'target' );
                $this->mTimestamp = $request->getText( 'timestamp' );
-               $this->mRestore = $request->getCheck( 'restore' );
+               $this->mRestore = $request->getCheck( 'restore' ) && $request->wasPosted();
                if( $par != "" ) {
                        $this->mTarget = $par;
                }
@@ -24,222 +284,150 @@ class UndeleteForm {
                } else {
                        $this->mTargetObj = NULL;
                }
+               if( $this->mRestore ) {
+                       $timestamps = array();
+                       foreach( $_REQUEST as $key => $val ) {
+                               if( preg_match( '/^ts(\d{14})$/', $key, $matches ) ) {
+                                       array_push( $timestamps, $matches[1] );
+                               }
+                       }
+                       rsort( $timestamps );
+                       $this->mTargetTimestamp = $timestamps;
+               }
        }
 
        function execute() {
-               if( !is_null( $this->mTargetObj ) ) {
-                       $title = $this->mTargetObj->mDbkeyform;
-                       $namespace = $this->mTargetObj->mNamespace;
-                       if( $this->mTimestamp !== "" ) {
-                               return $this->showRevision( $namespace, $title, $this->mTimestamp );
-                       }
-                       if( $this->mRestore and $this->mAction == "submit" ) {
-                               return $this->undelete( $namespace, $title );
-                       }
-                       return $this->showHistory( $namespace, $title );
-               } else {
+               if( is_null( $this->mTargetObj ) ) {
                        return $this->showList();
                }
+               if( $this->mTimestamp !== "" ) {
+                       return $this->showRevision( $this->mTimestamp );
+               }
+               if( $this->mRestore && $this->mAction == "submit" ) {
+                       return $this->undelete();
+               }
+               return $this->showHistory();
        }
 
        /* private */ function showList() {
-               global $wgLang, $wgUser, $wgOut;
+               global $wgLang, $wgContLang, $wgUser, $wgOut;
                $fname = "UndeleteForm::showList";
                
                # List undeletable articles    
-               $sql = "SELECT ar_namespace,ar_title, COUNT(*) AS count FROM archive " . 
-                 "GROUP BY ar_namespace,ar_title ORDER BY ar_namespace,ar_title";
-               $res = wfQuery( $sql, DB_READ, $fname );
+               $result = PageArchive::listAllPages();
                
                $wgOut->setPagetitle( wfMsg( "undeletepage" ) );
                $wgOut->addWikiText( wfMsg( "undeletepagetext" ) );
 
-               $special = $wgLang->getNsText( Namespace::getSpecial() );
                $sk = $wgUser->getSkin();
+               $undelete =& Title::makeTitle( NS_SPECIAL, 'Undelete' );
                $wgOut->addHTML( "<ul>\n" );
-               while ($row = wfFetchObject( $res )) {
+               while( $row = $result->fetchObject() ) {
                        $n = ($row->ar_namespace ? 
-                               ($wgLang->getNsText( $row->ar_namespace ) . ":") : "").
+                               ($wgContLang->getNsText( $row->ar_namespace ) . ":") : "").
                                $row->ar_title;
-
-                       $wgOut->addHTML( "<li>" .
-                         $sk->makeKnownLink( $wgLang->specialPage( "Undelete" ),
-                         $n, "target=" . urlencode($n) ) . " " .
-                         wfMsg( "undeleterevisions", $row->count ) );
+                       $link = $sk->makeKnownLinkObj( $undelete,
+                               htmlspecialchars( $n ), "target=" . urlencode( $n ) );
+                       $revisions = htmlspecialchars( wfMsg( "undeleterevisions",
+                               $wgLang->formatNum( $row->count ) ) );
+                       $wgOut->addHTML( "<li>$link $revisions</li>\n" );
                }
+               $result->free();
                $wgOut->addHTML( "</ul>\n" );
                
-               return 0;
+               return true;
        }
        
-       /* private */ function showRevision( $namespace, $title, $timestamp ) {
+       /* private */ function showRevision( $timestamp ) {
                global $wgLang, $wgUser, $wgOut;
                $fname = "UndeleteForm::showRevision";
 
                if(!preg_match("/[0-9]{14}/",$timestamp)) return 0;
-               
-               $sql = "SELECT ar_text,ar_flags FROM archive ". 
-                 "WHERE ar_namespace={$namespace} AND ar_title='" .
-                 wfStrencode( $title ) . "' AND ar_timestamp='" . wfStrencode( $timestamp ) ."'";
-               $ret = wfQuery( $sql, DB_READ, $fname );
-               $row = wfFetchObject( $ret );
+
+               $archive =& new PageArchive( $this->mTargetObj );
+               $text = $archive->getRevisionText( $timestamp );
                
                $wgOut->setPagetitle( wfMsg( "undeletepage" ) );
-               $wgOut->addWikiText( "(" . wfMsg( "undeleterevision", $wgLang->date($timestamp, true) )
-                 . ")\n<hr>\n" . Article::getRevisionText( $row, "ar_" ) );
-
-               return 0;
+               $wgOut->addWikiText( "(" . wfMsg( "undeleterevision",
+                       $wgLang->date( $timestamp ) ) . ")\n<hr />\n" . $text );
        }
 
-       /* private */ function showHistory( $namespace, $title ) {
+       /* private */ function showHistory() {
                global $wgLang, $wgUser, $wgOut;
                
                $sk = $wgUser->getSkin();
                $wgOut->setPagetitle( wfMsg( "undeletepage" ) );
-               
-               # Get text of first revision
-               $sql = "SELECT ar_text FROM archive WHERE ar_namespace={$namespace} AND ar_title='" .
-                 wfStrencode( $title ) . "' ORDER BY ar_timestamp DESC LIMIT 1";
-               $ret = wfQuery( $sql, DB_READ );
 
-               if( wfNumRows( $ret ) == 0 ) {
+               $archive = new PageArchive( $this->mTargetObj );
+               $text = $archive->getLastRevisionText();
+               if( is_null( $text ) ) {
                        $wgOut->addWikiText( wfMsg( "nohistory" ) );
-                       return 0;
+                       return;
                }
-               $row = wfFetchObject( $ret );
-               $wgOut->addWikiText( wfMsg( "undeletehistory" ) . "\n<hr>\n" . $row->ar_text );
-
-               # Get remaining revisions
-               $sql = "SELECT ar_minor_edit,ar_timestamp,ar_user,ar_user_text,ar_comment
-                 FROM archive WHERE ar_namespace={$namespace} AND ar_title='" . wfStrencode( $title ) .
-                 "' ORDER BY ar_timestamp DESC";
-               $ret = wfQuery( $sql, DB_READ );
-               # Ditch first row
-               $row = wfFetchObject( $ret );
+               $wgOut->addWikiText( wfMsg( "undeletehistory" ) . "\n----\n" . $text );
 
+               # List all stored revisions
+               $revisions = $archive->listRevisions();
+               
                $titleObj = Title::makeTitle( NS_SPECIAL, "Undelete" );
                $action = $titleObj->escapeLocalURL( "action=submit" );
                $encTarget = htmlspecialchars( $this->mTarget );
+               $button = htmlspecialchars( wfMsg("undeletebtn") );
                
-               $wgOut->addHTML("<p>
+               $wgOut->addHTML("
        <form id=\"undelete\" method=\"post\" action=\"{$action}\">
-       <input type=hidden name=\"target\" value=\"{$encTarget}\">
-       <input type=submit name=\"restore\" value=\"".wfMsg("undeletebtn")."\">
-       </form>");
+       <input type=\"hidden\" name=\"target\" value=\"{$encTarget}\" />
+       <input type=\"submit\" name=\"restore\" value=\"{$button}\" />
+       ");
 
-               $log = wfGetSQL("cur", "cur_text", "cur_namespace=4 AND cur_title='".
-                 wfStrencode( wfMsg("dellogpage") ) . "'" );
-               if(preg_match("/^(.*".
-                       preg_quote( ($namespace ? ($wgLang->getNsText($namespace) . ":") : "")
-                       . str_replace("_", " ", $title), "/" ).".*)$/m", $log, $m)) {
-                       $wgOut->addWikiText( $m[1] );
-               }
+               # Show relevant lines from the deletion log:
+               $wgOut->addHTML( "<h2>" . htmlspecialchars( LogPage::logName( 'delete' ) ) . "</h2>\n" );
+               require_once( 'SpecialLog.php' );
+               $logViewer =& new LogViewer(
+                       new LogReader(
+                               new FauxRequest(
+                                       array( 'page' => $this->mTargetObj->getPrefixedText(),
+                                              'type' => 'delete' ) ) ) );
+               $logViewer->showList( $wgOut );
                
-               $special = $wgLang->getNsText( Namespace::getSpecial() );
+               # The page's stored (deleted) history:
+               $wgOut->addHTML( "<h2>" . htmlspecialchars( wfMsg( "history" ) ) . "</h2>\n" );
                $wgOut->addHTML("<ul>");
-               while( $row = wfFetchObject( $ret ) ) {
-                       $wgOut->addHTML( "<li>" .
-                         $sk->makeKnownLink( $wgLang->specialPage( "Undelete" ),
-                         $wgLang->timeanddate( $row->ar_timestamp, true ),
-                         "target=" . urlencode($this->mTarget) . "&timestamp={$row->ar_timestamp}" ) . " " .
-                         ". . " . htmlspecialchars( $row->ar_user_text )  .
-                         " <i>(" . htmlspecialchars($row->ar_comment) . "</i>)\n");
-
-               }
-               $wgOut->addHTML("</ul>");
-               
-               return 0;
-       }       
-
-       /* private */ function undelete( $namespace, $title )
-       {
-               global $wgUser, $wgOut, $wgLang, $wgDeferredUpdateList;
-               global  $wgUseSquid, $wgInternalServer;
-
-               $fname = "doUndeleteArticle";
-
-               if ( "" == $title ) {
-                       $wgOut->fatalError( wfMsg( "cannotundelete" ) );
-                       return;
-               }
-               $t = wfStrencode($title);
-
-               # Move article and history from the "archive" table
-               $sql = "SELECT COUNT(*) AS count FROM cur WHERE cur_namespace={$namespace} AND cur_title='{$t}'";
-               $res = wfQuery( $sql, DB_READ );
-               $row = wfFetchObject( $res );
-               $now = wfTimestampNow();
+               $target = urlencode( $this->mTarget );
+               while( $row = $revisions->fetchObject() ) {
+                       $ts = wfTimestamp( TS_MW, $row->ar_timestamp );
+                       $checkBox = "<input type=\"checkbox\" name=\"ts$ts\" value=\"1\" />";
+                       $pageLink = $sk->makeKnownLinkObj( $titleObj,
+                               $wgLang->timeanddate( $row->ar_timestamp, true ),
+                               "target=$target&timestamp=$ts" );
+                       $userLink = htmlspecialchars( $row->ar_user_text );
+                       if( $row->ar_user ) {
+                               $userLink = $sk->makeKnownLinkObj(
+                                       Title::makeTitle( NS_USER, $row->ar_user_text ),
+                                       $userLink );
+                       }
+                       $comment = $sk->formatComment( $row->ar_comment );
+                       $wgOut->addHTML( "<li>$checkBox $pageLink . . $userLink (<i>$comment</i>)</li>\n" );
 
-               if( $row->count == 0) {
-                       # Have to create new article...
-                       $sql = "SELECT ar_text,ar_timestamp,ar_flags FROM archive WHERE ar_namespace={$namespace} AND ar_title='{$t}' ORDER BY ar_timestamp DESC LIMIT 1";
-                       $res = wfQuery( $sql, DB_READ, $fname );
-                       $s = wfFetchObject( $res );
-                       $max = $s->ar_timestamp;
-                       $redirect = MagicWord::get( MAG_REDIRECT );
-                       $redir = $redirect->matchStart( $s->ar_text ) ? 1 : 0;
-                       
-                       $sql = "INSERT INTO cur (cur_namespace,cur_title,cur_text," .
-                         "cur_comment,cur_user,cur_user_text,cur_timestamp,inverse_timestamp,cur_minor_edit,cur_is_redirect,cur_random,cur_touched)" .
-                         "SELECT ar_namespace,ar_title,ar_text,ar_comment," .
-                         "ar_user,ar_user_text,ar_timestamp,99999999999999-ar_timestamp,ar_minor_edit,{$redir},RAND(),'{$now}' FROM archive " .
-                         "WHERE ar_namespace={$namespace} AND ar_title='{$t}' AND ar_timestamp={$max}";
-                       wfQuery( $sql, DB_WRITE, $fname );
-                       $newid = wfInsertId();
-                       $oldones = "AND ar_timestamp<{$max}";
-               } else {
-                       # If already exists, put history entirely into old table
-                       $oldones = "";
-                       $newid = 0;
-                       
-                       # But to make the history list show up right, we need to touch it.
-                       $sql = "UPDATE cur SET cur_touched='{$now}' WHERE cur_namespace={$namespace} AND cur_title='{$t}'";
-                       wfQuery( $sql, DB_WRITE, $fname );
-                       
-                       # FIXME: Sometimes restored entries will be _newer_ than the current version.
-                       # We should merge.
                }
+               $revisions->free();
+               $wgOut->addHTML("</ul>\n</form>");
                
-               $sql = "INSERT INTO old (old_namespace,old_title,old_text," .
-                 "old_comment,old_user,old_user_text,old_timestamp,inverse_timestamp,old_minor_edit," .
-                 "old_flags) SELECT ar_namespace,ar_title,ar_text,ar_comment," .
-                 "ar_user,ar_user_text,ar_timestamp,99999999999999-ar_timestamp,ar_minor_edit,ar_flags " .
-                 "FROM archive WHERE ar_namespace={$namespace} AND ar_title='{$t}' {$oldones}";
-               wfQuery( $sql, DB_WRITE, $fname );
-
-               # Finally, clean up the link tables 
-               if( $newid ) {
-                       # Create a dummy OutputPage to update the outgoing links
-                       # This works at the moment due to good luck. It may stop working in the 
-                       # future. Damn globals.
-                       $dummyOut = new OutputPage();
-                       $res = wfQuery( "SELECT cur_text FROM cur WHERE cur_id={$newid} " .
-                         "AND cur_namespace={$namespace}", DB_READ, $fname );
-                       $row = wfFetchObject( $res );
-                       $text = $row->cur_text;
-                       $dummyOut->addWikiText( $text );
-                       wfFreeResult( $res );
-
-                       $u = new LinksUpdate( $newid, $this->mTargetObj->getPrefixedDBkey() );
-                       array_push( $wgDeferredUpdateList, $u );
-                               
-                       Article::onArticleCreate( $this->mTargetObj );
+               return true;
+       }
 
-                       #TODO: SearchUpdate, etc.
+       function undelete() {
+               global $wgOut;
+               if( !is_null( $this->mTargetObj ) ) {
+                       $archive = new PageArchive( $this->mTargetObj );
+                       if( $archive->undelete( $this->mTargetTimestamp ) ) {
+                               $wgOut->addWikiText( wfMsg( "undeletedtext", $this->mTarget ) );
+                               return true;
+                       }
                }
-
-               # Now that it's safely stored, take it out of the archive
-               $sql = "DELETE FROM archive WHERE ar_namespace={$namespace} AND " .
-                 "ar_title='{$t}'";
-               wfQuery( $sql, DB_WRITE, $fname );
-
-               
-               # Touch the log?
-               $log = new LogPage( wfMsg( "dellogpage" ), wfMsg( "dellogpagetext" ) );
-               $log->addEntry( wfMsg( "undeletedarticle", $this->mTarget ), "" );
-
-               $wgOut->addWikiText( wfMsg( "undeletedtext", $this->mTarget ) );
-               return 0;
+               $wgOut->fatalError( wfMsg( "cannotundelete" ) );
+               return false;
        }
 }
+
 ?>