fixed prefixed links (for arabic wikipedia)
[lhc/web/wiklou.git] / includes / Article.php
index 9d49d75..7f1aacf 100644 (file)
@@ -64,7 +64,12 @@ class Article {
        # Return the text of this revision
        function getContent( $noredir = false )
        {
-               global $action,$section,$count; # From query string
+               global $wgRequest;
+
+               # Get variables from query string :P
+               $action = $wgRequest->getText( 'action', 'view' );
+               $section = $wgRequest->getText( 'section' );
+
                $fname =  "Article::getContent"; 
                wfProfileIn( $fname );
 
@@ -116,13 +121,29 @@ class Article {
        # Load the revision (including cur_text) into this object
        function loadContent( $noredir = false )
        {
-               global $wgOut, $wgMwRedir;
-               global $oldid, $redirect; # From query
+               global $wgOut, $wgMwRedir, $wgRequest;
+               
+               # Query variables :P
+               $oldid = $wgRequest->getVal( 'oldid' );
+               $redirect = $wgRequest->getVal( 'redirect' );
 
                if ( $this->mContentLoaded ) return;
                $fname = "Article::loadContent";
-               $success = true;
                
+               # Pre-fill content with error message so that if something       
+               # fails we'll have something telling us what we intended.        
+
+               $t = $this->mTitle->getPrefixedText();   
+               if ( isset( $oldid ) ) {         
+                       $oldid = IntVal( $oldid );       
+                       $t .= ",oldid={$oldid}";         
+               }        
+               if ( isset( $redirect ) ) {      
+                       $redirect = ($redirect == "no") ? "no" : "yes";          
+                       $t .= ",redirect={$redirect}";   
+               }        
+               $this->mContent = wfMsg( "missingarticle", $t );
+       
                if ( ! $oldid ) {       # Retrieve current version
                        $id = $this->getID();
                        if ( 0 == $id ) return;
@@ -194,23 +215,85 @@ class Article {
                        $this->mTimestamp = $s->old_timestamp;
                        wfFreeResult( $res );
                }
+               $this->mContentLoaded = true;
+               return $this->mContent;
+       }
 
-               # Return error message :P
-               # Horrible, confusing UI and data. I think this should return false on error -- TS
-               if ( !$success ) {
-                       $t = $this->mTitle->getPrefixedText();
-                       if ( isset( $oldid ) ) {
-                               $oldid = IntVal( $oldid );
-                               $t .= ",oldid={$oldid}";
+       # Gets the article text without using so many damn globals
+       # Returns false on error
+       function getContentWithoutUsingSoManyDamnGlobals( $oldid = 0, $noredir = false ) {
+               global $wgMwRedir;
+
+               if ( $this->mContentLoaded ) {
+                       return $this->mContent;
+               }
+               $this->mContent = false;
+               
+               $fname = "Article::loadContent";
+               
+               if ( ! $oldid ) {       # Retrieve current version
+                       $id = $this->getID();
+                       if ( 0 == $id ) {
+                               return false;
                        }
-                       if ( isset( $redirect ) ) {
-                               $redirect = ($redirect == "no") ? "no" : "yes";
-                               $t .= ",redirect={$redirect}";
+
+                       $sql = "SELECT " .
+                         "cur_text,cur_timestamp,cur_user,cur_counter,cur_restrictions,cur_touched " .
+                         "FROM cur WHERE cur_id={$id}";
+                       $res = wfQuery( $sql, DB_READ, $fname );
+                       if ( 0 == wfNumRows( $res ) ) { 
+                               return false; 
+                       }
+
+                       $s = wfFetchObject( $res );
+                       # If we got a redirect, follow it (unless we've been told
+                       # not to by either the function parameter or the query
+                       if ( !$noredir && $wgMwRedir->matchStart( $s->cur_text ) ) {
+                               if ( preg_match( "/\\[\\[([^\\]\\|]+)[\\]\\|]/",
+                                 $s->cur_text, $m ) ) {
+                                       $rt = Title::newFromText( $m[1] );
+                                       if( $rt &&  $rt->getInterwiki() == "" && $rt->getNamespace() != Namespace::getSpecial() ) {
+                                               $rid = $rt->getArticleID();
+                                               if ( 0 != $rid ) {
+                                                       $sql = "SELECT cur_text,cur_timestamp,cur_user," .
+                                                         "cur_counter,cur_restrictions,cur_touched FROM cur WHERE cur_id={$rid}";
+                                                       $res = wfQuery( $sql, DB_READ, $fname );
+       
+                                                       if ( 0 != wfNumRows( $res ) ) {
+                                                               $this->mRedirectedFrom = $this->mTitle->getPrefixedText();
+                                                               $this->mTitle = $rt;
+                                                               $s = wfFetchObject( $res );
+                                                       }
+                                               }
+                                       }
+                               }
+                       }
+
+                       $this->mContent = $s->cur_text;
+                       $this->mUser = $s->cur_user;
+                       $this->mCounter = $s->cur_counter;
+                       $this->mTimestamp = $s->cur_timestamp;
+                       $this->mTouched = $s->cur_touched;
+                       $this->mTitle->mRestrictions = explode( ",", trim( $s->cur_restrictions ) );
+                       $this->mTitle->mRestrictionsLoaded = true;
+                       wfFreeResult( $res );
+               } else { # oldid set, retrieve historical version
+                       $sql = "SELECT old_text,old_timestamp,old_user,old_flags FROM old " .
+                         "WHERE old_id={$oldid}";
+                       $res = wfQuery( $sql, DB_READ, $fname );
+                       if ( 0 == wfNumRows( $res ) ) { 
+                               return false; 
                        }
-                       $this->mContent = wfMsg( "missingarticle", $t );
-               }
 
+                       $s = wfFetchObject( $res );
+                       $this->mContent = Article::getRevisionText( $s );
+                       $this->mUser = $s->old_user;
+                       $this->mCounter = 0;
+                       $this->mTimestamp = $s->old_timestamp;
+                       wfFreeResult( $res );
+               }
                $this->mContentLoaded = true;
+               return $this->mContent;
        }
 
        function getID() {
@@ -302,28 +385,31 @@ class Article {
 
        function view()
        {
-               global $wgUser, $wgOut, $wgLang;
-               global $oldid, $diff, $printable; # From query
+               global $wgUser, $wgOut, $wgLang, $wgRequest;
                global $wgLinkCache, $IP, $wgEnableParserCache;
                
                $fname = "Article::view";
                wfProfileIn( $fname );
 
+               # Get variables from query string :P
+               $oldid = $wgRequest->getVal( 'oldid' );
+               $diff = $wgRequest->getVal( 'diff' );
+
                $wgOut->setArticleFlag( true );
                $wgOut->setRobotpolicy( "index,follow" );
 
                # If we got diff and oldid in the query, we want to see a
                # diff page instead of the article.
 
-               if ( isset( $diff ) ) {
+               if ( !is_null( $diff ) ) {
                        $wgOut->setPageTitle( $this->mTitle->getPrefixedText() );
-                       $de = new DifferenceEngine( $oldid, $diff );
+                       $de = new DifferenceEngine( intval($oldid), intval($diff) );
                        $de->showDiffPage();
                        wfProfileOut( $fname );
                        return;
                }
 
-               if ( !isset( $oldid ) and $this->checkTouched() ) {
+               if ( !is_null( $oldid ) and $this->checkTouched() ) {
                        if( $wgOut->checkLastModified( $this->mTouched ) ){
                                return;
                        } else if ( $this->tryFileCache() ) {
@@ -341,7 +427,7 @@ class Article {
 
                # We're looking at an old revision
 
-               if ( $oldid ) {
+               if ( !empty( $oldid ) ) {
                        $this->setOldSubtitle();
                        $wgOut->setRobotpolicy( "noindex,follow" );
                }
@@ -355,16 +441,15 @@ class Article {
 
                $wgLinkCache->preFill( $this->mTitle );
                
-               if ( $printable == "yes" ) {
-                       $wgOut->mParserOptions->setPrintable( true );
-               }
-
                if( $wgEnableParserCache && intval($wgUser->getOption( "stubthreshold" )) == 0 ){
                        $wgOut->addWikiText( $text, true, $this );
                } else {
                        $wgOut->addWikiText( $text );
                }
 
+               # Add link titles as META keywords
+               $wgOut->addMetaTags() ;
+
                $this->viewUpdates();
                wfProfileOut( $fname );
        }
@@ -426,35 +511,16 @@ class Article {
                
                # standard deferred updates
                $this->editUpdates( $text );
-               
-               # Squid purging
-               if ( $wgUseSquid ) {
-                       $urlArr = Array( 
-                               $this->mTitle->getInternalURL(),
-                               $this->mTitle->getInternalURL('action=history')
-                       );                      
-                       wfPurgeSquidServers($urlArr);
-                       /* this needs to be done after LinksUpdate */
-                       $u = new SquidUpdate($this->mTitle);
-                       array_push( $wgDeferredUpdateList, $u );
-               }
-               
+
                $this->showArticle( $text, wfMsg( "newarticle" ) );
        }
 
-       function updateArticle( $text, $summary, $minor, $watchthis, $section = "", $forceBot = false )
-       {
-               global $wgOut, $wgUser, $wgLinkCache;
-               global $wgDBtransactions, $wgMwRedir;
-               global $wgUseSquid, $wgInternalServer;
-               $fname = "Article::updateArticle";
 
+       /* Side effects: loads last edit */
+       function getTextOfLastEditWithSectionReplacedOrAdded($section, $text, $summary = ""){
                $this->loadLastEdit();
-
-               // insert updated section into old text if we have only edited part 
-               // of the article               
-               if ($section != "") {                   
-                       $oldtext=$this->getContent();
+               $oldtext = $this->getContent();
+               if ($section != "") {
                        if($section=="new") {
                                if($summary) $subject="== {$summary} ==\n\n";
                                $text=$oldtext."\n\n".$subject.$text;
@@ -466,6 +532,16 @@ class Article {
                                $text=join("",$secs);           
                        }
                }
+               return $text;
+       }
+
+       function updateArticle( $text, $summary, $minor, $watchthis, $forceBot = false )
+       {
+               global $wgOut, $wgUser, $wgLinkCache;
+               global $wgDBtransactions, $wgMwRedir;
+               global $wgUseSquid, $wgInternalServer;
+               $fname = "Article::updateArticle";
+
                if ( $this->mMinorEdit ) { $me1 = 1; } else { $me1 = 0; }
                if ( $minor && $wgUser->getID() ) { $me2 = 1; } else { $me2 = 0; }              
                if ( preg_match( "/^((" . $wgMwRedir->getBaseRegex() . ")[^\\n]+)/i", $text, $m ) ) {
@@ -543,14 +619,25 @@ class Article {
                # standard deferred updates
                $this->editUpdates( $text );
                
-               # Squid updates
                
+               $urls = array();
+               # Template namespace
+               # Purge all articles linking here
+               if ( $this->mTitle->getNamespace() == NS_TEMPLATE) {
+                       $titles = $this->mTitle->getLinksTo();
+                       Title::touchArray( $titles );
+                       if ( $wgUseSquid ) {
+                               foreach ( $titles as $title ) {
+                                       $urls[] = $title->getInternalURL();
+                               }
+                       }
+               }
+       
+               # Squid updates
                if ( $wgUseSquid ) {
-                       $urlArr = Array( 
-                               $this->mTitle->getInternalURL(),
-                               $this->mTitle->getInternalURL('action=history')
-                       );                      
-                       wfPurgeSquidServers($urlArr);
+                       $urls = array_merge( $urls, $this->mTitle->getSquidURLs() );
+                       $u = new SquidUpdate( $urls );
+                       $u->doUpdate();
                }
 
                $this->showArticle( $text, wfMsg( "updated" ) );
@@ -606,13 +693,13 @@ class Article {
                $wgOut->setRobotpolicy( "noindex,follow" );
 
                $sk = $wgUser->getSkin() ;
-               $link = $sk->makeKnownLink ( $this->mTitle->getPrefixedText() ) ;
+               $link = $this->mTitle->getPrefixedText();
 
                if($add)
                        $text = wfMsg( "addedwatchtext", $link );
                else
                        $text = wfMsg( "removedwatchtext", $link );
-               $wgOut->addHTML( $text );
+               $wgOut->addWikiText( $text );
 
                $up = new UserUpdate();
                array_push( $wgDeferredUpdateList, $up );
@@ -627,7 +714,7 @@ class Article {
 
        function protect( $limit = "sysop" )
        {
-               global $wgUser, $wgOut;
+               global $wgUser, $wgOut, $wgRequest;
 
                if ( ! $wgUser->isSysop() ) {
                        $wgOut->sysopRequired();
@@ -642,17 +729,91 @@ class Article {
                        $wgOut->fatalEror( wfMsg( "badarticleerror" ) );
                        return;
                }
+
+               $confirm = $wgRequest->getBool( 'wpConfirmProtect' ) && $wgRequest->wasPosted();
+               $reason = $wgRequest->getText( 'wpReasonProtect' );
+
+               if ( $confirm ) {
+
         $sql = "UPDATE cur SET cur_touched='" . wfTimestampNow() . "'," .
                        "cur_restrictions='{$limit}' WHERE cur_id={$id}";
                wfQuery( $sql, DB_WRITE, "Article::protect" );
 
                $log = new LogPage( wfMsg( "protectlogpage" ), wfMsg( "protectlogtext" ) );
                if ( $limit === "" ) {
-                       $log->addEntry( wfMsg( "unprotectedarticle", $this->mTitle->getPrefixedText() ), "" );          
+                               $log->addEntry( wfMsg( "unprotectedarticle", $this->mTitle->getPrefixedText() ), $reason );
                } else {
-                       $log->addEntry( wfMsg( "protectedarticle", $this->mTitle->getPrefixedText() ), "" );
+                               $log->addEntry( wfMsg( "protectedarticle", $this->mTitle->getPrefixedText() ), $reason );
                }
                $wgOut->redirect( $this->mTitle->getFullURL() );
+                       return;
+               } else {
+                       $reason = htmlspecialchars( wfMsg( "protectreason" ) );
+                       return $this->confirmProtect( "", $reason, $limit );
+               }
+       }
+
+               # Output protection confirmation dialog
+       function confirmProtect( $par, $reason, $limit = "sysop"  )
+       {
+               global $wgOut;
+
+               wfDebug( "Article::confirmProtect\n" );
+
+               $sub = htmlspecialchars( $this->mTitle->getPrefixedText() );
+               $wgOut->setRobotpolicy( "noindex,nofollow" );
+
+               $check = "";
+               $protcom = "";
+
+               if ( $limit === "" ) {
+                       $wgOut->setSubtitle( wfMsg( "unprotectsub", $sub ) );
+                       $wgOut->addWikiText( wfMsg( "confirmunprotecttext" ) );
+                       $check = htmlspecialchars( wfMsg( "confirmunprotect" ) );
+                       $protcom = htmlspecialchars( wfMsg( "unprotectcomment" ) );
+                       $formaction = $this->mTitle->escapeLocalURL( "action=unprotect" . $par );
+               } else {
+                       $wgOut->setSubtitle( wfMsg( "protectsub", $sub ) );
+                       $wgOut->addWikiText( wfMsg( "confirmprotecttext" ) );
+                       $check = htmlspecialchars( wfMsg( "confirmprotect" ) );
+                       $protcom = htmlspecialchars( wfMsg( "protectcomment" ) );
+                       $formaction = $this->mTitle->escapeLocalURL( "action=protect" . $par );
+               }
+
+               $confirm = htmlspecialchars( wfMsg( "confirm" ) );
+
+               $wgOut->addHTML( "
+<form id='protectconfirm' method='post' action=\"{$formaction}\">
+       <table border='0'>
+               <tr>
+                       <td align='right'>
+                               <label for='wpReasonProtect'>{$protcom}:</label>
+                       </td>
+                       <td align='left'>
+                               <input type='text' size='60' name='wpReasonProtect' id='wpReasonProtect' value=\"" . htmlspecialchars( $reason ) . "\" />
+                       </td>
+               </tr>
+               <tr>
+                       <td>&nbsp;</td>
+               </tr>
+               <tr>
+                       <td align='right'>
+                               <input type='checkbox' name='wpConfirmProtect' value='1' id='wpConfirmProtect' />
+                       </td>
+                       <td>
+                               <label for='wpConfirmProtect'>{$check}</label>
+                       </td>
+               </tr>
+               <tr>
+                       <td>&nbsp;</td>
+                       <td>
+                               <input type='submit' name='wpConfirmProtectB' value=\"{$confirm}\" />
+                       </td>
+               </tr>
+       </table>
+</form>\n" );
+
+               $wgOut->returnToMain( false );
        }
 
        function unprotect()
@@ -660,13 +821,17 @@ class Article {
                return $this->protect( "" );
        }
 
+       # UI entry point for page deletion 
        function delete()
        {
-               global $wgUser, $wgOut, $wgMessageCache;
-               global $wpConfirm, $wpReason, $image, $oldimage;
-
+               global $wgUser, $wgOut, $wgMessageCache, $wgRequest;
+               $fname = "Article::delete";
+               $confirm = $wgRequest->getBool( 'wpConfirm' ) && $wgRequest->wasPosted();
+               $reason = $wgRequest->getText( 'wpReason' );
+               
                # This code desperately needs to be totally rewritten
                
+               # Check permissions
                if ( ( ! $wgUser->isSysop() ) ) {
                        $wgOut->sysopRequired();
                        return;
@@ -676,12 +841,6 @@ class Article {
                        return;
                }
 
-               # Can't delete cached MediaWiki namespace (i.e. vital messages)
-               if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI && $wgMessageCache->isCacheable( $this->mTitle->getDBkey() ) ) {
-                       $wgOut->fatalError( wfMsg( "cannotdelete" ) );
-                       return;
-               }
-
                # Better double-check that it hasn't been deleted yet!
                $wgOut->setPagetitle( wfMsg( "confirmdelete" ) );
                if ( ( "" == trim( $this->mTitle->getText() ) )
@@ -690,8 +849,8 @@ class Article {
                        return;
                }
 
-               if ( $_POST["wpConfirm"] ) {
-                       $this->doDelete();
+               if ( $confirm ) {
+                       $this->doDelete( $reason );
                        return;
                }
 
@@ -703,10 +862,10 @@ class Article {
                $etitle = wfStrencode( $title );
                $sql = "SELECT old_text,old_flags FROM old WHERE old_namespace=$ns and old_title='$etitle' ORDER BY inverse_timestamp LIMIT 1";
                $res = wfQuery( $sql, DB_READ, $fname );
-               if( ($old=wfFetchObject($res)) && !$wpConfirm ) {
+               if( ($old=wfFetchObject($res)) && !$confirm ) {
                        $skin=$wgUser->getSkin();
-                       $wgOut->addHTML("<B>".wfMsg("historywarning"));
-                       $wgOut->addHTML( $skin->historyLink() ."</B><P>");
+                       $wgOut->addHTML("<b>".wfMsg("historywarning"));
+                       $wgOut->addHTML( $skin->historyLink() ."</b>");
                }
 
                $sql="SELECT cur_text FROM cur WHERE cur_namespace=$ns and cur_title='$etitle'";
@@ -716,12 +875,13 @@ class Article {
                        # if this is a mini-text, we can paste part of it into the deletion reason
 
                        #if this is empty, an earlier revision may contain "useful" text
+                       $blanked = false;
                        if($s->cur_text!="") {
                                $text=$s->cur_text;
                        } else {
                                if($old) {
                                        $text = Article::getRevisionText( $old );
-                                       $blanked=1;
+                                       $blanked = true;
                                }
                                
                        }
@@ -730,10 +890,11 @@ class Article {
                        
                        # this should not happen, since it is not possible to store an empty, new
                        # page. Let's insert a standard text in case it does, though
-                       if($length==0 && !$wpReason) { $wpReason=wfmsg("exblank");}
-                       
+                       if($length == 0 && $reason === "") { 
+                               $reason = wfMsg("exblank");
+                       }
                        
-                       if($length < 500 && !$wpReason) {
+                       if($length < 500 && $reason === "") {
                                                                        
                                # comment field=255, let's grep the first 150 to have some user
                                # space left
@@ -744,22 +905,22 @@ class Article {
                                $text=preg_replace("/\>/","&gt;",$text);
                                $text=preg_replace("/[\n\r]/","",$text);
                                if(!$blanked) {
-                                       $wpReason=wfMsg("excontent"). " '".$text;
+                                       $reason=wfMsg("excontent"). " '".$text;
                                } else {
-                                       $wpReason=wfMsg("exbeforeblank") . " '".$text;
+                                       $reason=wfMsg("exbeforeblank") . " '".$text;
                                }
-                               if($length>150) { $wpReason .= "..."; } # we've only pasted part of the text
-                               $wpReason.="'"; 
+                               if($length>150) { $reason .= "..."; } # we've only pasted part of the text
+                               $reason.="'"; 
                        }
                }
 
-               return $this->confirmDelete();
+               return $this->confirmDelete( "", $reason );
        }
        
-       function confirmDelete( $par = "" )
+       # Output deletion confirmation dialog
+       function confirmDelete( $par, $reason )
        {
                global $wgOut;
-               global $wpReason;
 
                wfDebug( "Article::confirmDelete\n" );
                
@@ -770,93 +931,112 @@ class Article {
 
                $formaction = $this->mTitle->escapeLocalURL( "action=delete" . $par );
                
-               $confirm = wfMsg( "confirm" );
-               $check = wfMsg( "confirmcheck" );
-               $delcom = wfMsg( "deletecomment" );
+               $confirm = htmlspecialchars( wfMsg( "confirm" ) );
+               $check = htmlspecialchars( wfMsg( "confirmcheck" ) );
+               $delcom = htmlspecialchars( wfMsg( "deletecomment" ) );
 
                $wgOut->addHTML( "
-<form id=\"deleteconfirm\" method=\"post\" action=\"{$formaction}\">
-<table border=0><tr><td align=right>
-{$delcom}:</td><td align=left>
-<input type=text size=60 name=\"wpReason\" value=\"" . htmlspecialchars( $wpReason ) . "\">
-</td></tr><tr><td>&nbsp;</td></tr>
-<tr><td align=right>
-<input type=checkbox name=\"wpConfirm\" value='1' id=\"wpConfirm\">
-</td><td><label for=\"wpConfirm\">{$check}</label></td>
-</tr><tr><td>&nbsp;</td><td>
-<input type=submit name=\"wpConfirmB\" value=\"{$confirm}\">
-</td></tr></table></form>\n" );
+<form id='deleteconfirm' method='post' action=\"{$formaction}\">
+       <table border='0'>
+               <tr>
+                       <td align='right'>
+                               <label for='wpReason'>{$delcom}:</label>
+                       </td>
+                       <td align='left'>
+                               <input type='text' size='60' name='wpReason' id='wpReason' value=\"" . htmlspecialchars( $reason ) . "\" />
+                       </td>
+               </tr>
+               <tr>
+                       <td>&nbsp;</td>
+               </tr>
+               <tr>
+                       <td align='right'>
+                               <input type='checkbox' name='wpConfirm' value='1' id='wpConfirm' />
+                       </td>
+                       <td>
+                               <label for='wpConfirm'>{$check}</label>
+                       </td>
+               </tr>
+               <tr>
+                       <td>&nbsp;</td>
+                       <td>
+                               <input type='submit' name='wpConfirmB' value=\"{$confirm}\" />
+                       </td>
+               </tr>
+       </table>
+</form>\n" );
 
                $wgOut->returnToMain( false );
        }
 
-       function doDelete()
+       # Perform a deletion and output success or failure messages
+       function doDelete( $reason )
        {
                global $wgOut, $wgUser, $wgLang;
-               global $wpReason;
                $fname = "Article::doDelete";
                wfDebug( "$fname\n" );
 
-               $this->doDeleteArticle( $this->mTitle );
-               $deleted = $this->mTitle->getPrefixedText();
+               if ( $this->doDeleteArticle( $reason ) ) {      
+                       $deleted = $this->mTitle->getPrefixedText();
 
-               $wgOut->setPagetitle( wfMsg( "actioncomplete" ) );
-               $wgOut->setRobotpolicy( "noindex,nofollow" );
+                       $wgOut->setPagetitle( wfMsg( "actioncomplete" ) );
+                       $wgOut->setRobotpolicy( "noindex,nofollow" );
 
-               $sk = $wgUser->getSkin();
-               $loglink = $sk->makeKnownLink( $wgLang->getNsText(
-                 Namespace::getWikipedia() ) .
-                 ":" . wfMsg( "dellogpage" ), wfMsg( "deletionlog" ) );
+                       $sk = $wgUser->getSkin();
+                       $loglink = $sk->makeKnownLink( $wgLang->getNsText(
+                         Namespace::getWikipedia() ) .
+                         ":" . wfMsg( "dellogpage" ), wfMsg( "deletionlog" ) );
 
-               $text = wfMsg( "deletedtext", $deleted, $loglink );
+                       $text = wfMsg( "deletedtext", $deleted, $loglink );
 
-               $wgOut->addHTML( "<p>" . $text );
-               $wgOut->returnToMain( false );
+                       $wgOut->addHTML( "<p>" . $text . "</p>\n" );
+                       $wgOut->returnToMain( false );
+               } else {
+                       $wgOut->fatalError( wfMsg( "cannotdelete" ) );
+               }
        }
 
-       function doDeleteArticle( $title )
+       # Back-end article deletion
+       # Deletes the article with database consistency, writes logs, purges caches
+       # Returns success
+       function doDeleteArticle( $reason )
        {
-               global $wgUser, $wgOut, $wgLang, $wgRequest;
+               global $wgUser, $wgLang;
                global  $wgUseSquid, $wgDeferredUpdateList, $wgInternalServer;
 
                $fname = "Article::doDeleteArticle";
                wfDebug( "$fname\n" );
 
-               $ns = $title->getNamespace();
-               $t = wfStrencode( $title->getDBkey() );
-               $id = $title->getArticleID();
+               $ns = $this->mTitle->getNamespace();
+               $t = wfStrencode( $this->mTitle->getDBkey() );
+               $id = $this->mTitle->getArticleID();
 
-               if ( "" == $t ) {
-                       $wgOut->fatalError( wfMsg( "cannotdelete" ) );
-                       return;
+               if ( "" == $t || $id == 0 ) {
+                       return false;
                }
 
                $u = new SiteStatsUpdate( 0, 1, -$this->isCountable( $this->getContent( true ) ) );
                array_push( $wgDeferredUpdateList, $u );
                
+               $linksTo = $this->mTitle->getLinksTo();
+
                # Squid purging
                if ( $wgUseSquid ) {
-                       $urlArr = Array(
+                       $urls = array(  
                                $this->mTitle->getInternalURL(),
-                               $this->mTitle->getInternalURL('action=history')
+                               $this->mTitle->getInternalURL( "history" ) 
                        );
-                       wfPurgeSquidServers($urlArr);
-
-                       /* prepare the list of urls to purge */
-                       $sql = "SELECT cur_namespace,cur_title FROM links,cur WHERE l_to={$id} and l_from=cur_id" ;
-                       $res = wfQuery ( $sql, DB_READ ) ;
-                       while ( $BL = wfFetchObject ( $res ) )
-                       {
-                               $tobj = Title::MakeTitle( $BL->cur_namespace, $BL->cur_title ) ; 
-                               $blurlArr[] = $tobj->getInternalURL();
+                       foreach ( $linksTo as $linkTo ) {
+                               $urls[] = $linkTo->getInternalURL();
                        }
-                       wfFreeResult ( $res ) ;
-                       $u = new SquidUpdate( $this->mTitle, $blurlArr );
+
+                       $u = new SquidUpdate( $urls );
                        array_push( $wgDeferredUpdateList, $u );
 
                }
 
-               
+               # Client and file cache invalidation
+               Title::touchArray( $linksTo );
 
                # Move article and history to the "archive" table
                $sql = "INSERT INTO archive (ar_namespace,ar_title,ar_text," .
@@ -888,55 +1068,44 @@ class Article {
                        wfQuery( $sql, DB_WRITE, $fname );
 
                # Finally, clean up the link tables
+               $t = wfStrencode( $this->mTitle->getPrefixedDBkey() );
 
-               if ( 0 != $id ) {
-
-                       $t = wfStrencode( $title->getPrefixedDBkey() );
-
-                       Article::onArticleDelete( $title );
-
-                       $sql = "SELECT l_from FROM links WHERE l_to={$id}";
-                       $res = wfQuery( $sql, DB_READ, $fname );
-
-                       $sql = "INSERT INTO brokenlinks (bl_from,bl_to) VALUES ";
-                       $now = wfTimestampNow();
-                       $sql2 = "UPDATE cur SET cur_touched='{$now}' WHERE cur_id IN (";
-                       $first = true;
-
-                       while ( $s = wfFetchObject( $res ) ) {
-                               if ( ! $first ) { $sql .= ","; $sql2 .= ","; }
-                               $first = false;
-                               $sql .= "({$s->l_from},'{$t}')";
-                               $sql2 .= "{$s->l_from}";
-                       }
-                       $sql2 .= ")";
-                       if ( ! $first ) {
-                               wfQuery( $sql, DB_WRITE, $fname );
-                               wfQuery( $sql2, DB_WRITE, $fname );
-                       }
-                       wfFreeResult( $res );
-
-                       $sql = "DELETE FROM links WHERE l_to={$id}";
+               Article::onArticleDelete( $this->mTitle );
+               
+               $sql = "INSERT INTO brokenlinks (bl_from,bl_to) VALUES ";
+               $first = true;
+
+               foreach ( $linksTo as $titleObj ) {
+                       if ( ! $first ) { $sql .= ","; }
+                       $first = false;
+                       # Get article ID. Efficient because it was loaded into the cache by getLinksTo().
+                       $linkID = $titleObj->getArticleID(); 
+                       $sql .= "({$linkID},'{$t}')";
+               }
+               if ( ! $first ) {
                        wfQuery( $sql, DB_WRITE, $fname );
+               }
 
-                       $sql = "DELETE FROM links WHERE l_from={$id}";
-                       wfQuery( $sql, DB_WRITE, $fname );
+               $sql = "DELETE FROM links WHERE l_to={$id}";
+               wfQuery( $sql, DB_WRITE, $fname );
 
-                       $sql = "DELETE FROM imagelinks WHERE il_from={$d}";
-                       wfQuery( $sql, DB_WRITE, $fname );
+               $sql = "DELETE FROM links WHERE l_from={$id}";
+               wfQuery( $sql, DB_WRITE, $fname );
 
-                       $sql = "DELETE FROM brokenlinks WHERE bl_from={$id}";
-                       wfQuery( $sql, DB_WRITE, $fname );
-               }
+               $sql = "DELETE FROM imagelinks WHERE il_from={$id}";
+               wfQuery( $sql, DB_WRITE, $fname );
+
+               $sql = "DELETE FROM brokenlinks WHERE bl_from={$id}";
+               wfQuery( $sql, DB_WRITE, $fname );
                
                $log = new LogPage( wfMsg( "dellogpage" ), wfMsg( "dellogpagetext" ) );
-               $art = $title->getPrefixedText();
-               $wpReason = $wgRequest->getText( "wpReason" );
-               $log->addEntry( wfMsg( "deletedarticle", $art ), $wpReason );
+               $art = $this->mTitle->getPrefixedText();
+               $log->addEntry( wfMsg( "deletedarticle", $art ), $reason );
 
                # Clear the cached article id so the interface doesn't act like we exist
                $this->mTitle->resetArticleID( 0 );
                $this->mTitle->mArticleID = 0;
+               return true;
        }
 
        function rollback()
@@ -1013,9 +1182,8 @@ class Article {
                $newcomment = wfMsg( "revertpage", $s->old_user_text, $from );
                $wgOut->setPagetitle( wfMsg( "actioncomplete" ) );
                $wgOut->setRobotpolicy( "noindex,nofollow" );
-               $wgOut->addHTML( "<h2>" . $newcomment . "</h2>\n<hr>\n" );
-               $this->updateArticle( Article::getRevisionText( $s ), $newcomment, 1, $this->mTitle->userIsWatching(), "", $bot );
-               
+               $wgOut->addHTML( "<h2>" . $newcomment . "</h2>\n<hr />\n" );
+               $this->updateArticle( Article::getRevisionText( $s ), $newcomment, 1, $this->mTitle->userIsWatching(), $bot );
                Article::onArticleEdit( $this->mTitle );
                $wgOut->returnToMain( false );
        }
@@ -1096,7 +1264,7 @@ class Article {
        
        /* Caching functions */
 
-       # checkLastModified returns true iff it has taken care of all
+       # checkLastModified returns true if it has taken care of all
        # output to the client that is necessary for this request.
        # (that is, it has sent a cached version of the page)
        function tryFileCache() {
@@ -1129,8 +1297,9 @@ class Article {
        }
 
        function isFileCacheable() {
-               global $wgUser, $wgUseFileCache, $wgShowIPinHeader;
-               global $action, $oldid, $diff, $redirect, $printable;
+               global $wgUser, $wgUseFileCache, $wgShowIPinHeader, $wgRequest;
+               extract( $wgRequest->getValues( 'action', 'oldid', 'diff', 'redirect', 'printable' ) );
+               
                return $wgUseFileCache
                        and (!$wgShowIPinHeader)
                        and ($this->getID() != 0)
@@ -1209,11 +1378,28 @@ class Article {
        #
        # This is a good place to put code to clear caches, for instance. 
 
+       # This is called on page move and undelete, as well as edit     
        /* static */ function onArticleCreate($title_obj){
-               global $wgEnablePersistentLC, $wgEnableParserCache;
+               global $wgEnablePersistentLC, $wgEnableParserCache, $wgUseSquid, $wgDeferredUpdateList;
+
+               $titles = $title_obj->getBrokenLinksTo();
+               
+               # Purge squid 
+               if ( $wgUseSquid ) {
+                       $urls = $title_obj->getSquidURLs();
+                       foreach ( $titles as $linkTitle ) {
+                               $urls[] = $linkTitle->getInternalURL();
+                       }
+                       $u = new SquidUpdate( $urls );
+                       array_push( $wgDeferredUpdateList, $u );
+               }
+
+               # Clear persistent link cache
                if ( $wgEnablePersistentLC ) {
                        LinkCache::linksccClearBrokenLinksTo( $title_obj->getPrefixedDBkey() );
                }
+
+               # Clear parser cache (not really used)
                if ( $wgEnableParserCache ) {
                        OutputPage::parsercacheClearBrokenLinksTo( $title_obj->getPrefixedDBkey() );
                }
@@ -1240,8 +1426,4 @@ class Article {
        }
 }
 
-function wfReplaceSubstVar( $matches ) {
-       return wfMsg( $matches[1] );
-}
-
 ?>