XHTML fixes.
[lhc/web/wiklou.git] / includes / Article.php
index c988c80..7ba998f 100644 (file)
@@ -1,17 +1,10 @@
-<?
+<?php
 # Class representing a Wikipedia article and history.
 # See design.doc for an overview.
 
 # Note: edit user interface and cache support functions have been
 # moved to separate EditPage and CacheManager classes.
 
-/* CHECK MERGE @@@
-   TEST THIS @@@
-
-   * s/\$wgTitle/\$this->mTitle/ performed, many replacements
-   * mTitle variable added to class
-*/
-
 include_once( "CacheManager.php" );
 
 class Article {
@@ -20,30 +13,63 @@ class Article {
        /* private */ var $mCounter, $mComment, $mCountAdjustment;
        /* private */ var $mMinorEdit, $mRedirectedFrom;
        /* private */ var $mTouched, $mFileCache, $mTitle;
-
+       /* private */ var $mId, $mTable;
+       
        function Article( &$title ) {
                $this->mTitle =& $title;
                $this->clear();
        }
-
+       
        /* private */ function clear()
        {
                $this->mContentLoaded = false;
-               $this->mUser = $this->mCounter = -1; # Not loaded
+               $this->mCurID = $this->mUser = $this->mCounter = -1; # Not loaded
                $this->mRedirectedFrom = $this->mUserText =
                $this->mTimestamp = $this->mComment = $this->mFileCache = "";
                $this->mCountAdjustment = 0;
                $this->mTouched = "19700101000000";
        }
 
+       /* static */ function getRevisionText( $row, $prefix = "old_" ) {
+               # Deal with optional compression of archived pages.
+               # This can be done periodically via maintenance/compressOld.php, and
+               # as pages are saved if $wgCompressRevisions is set.
+               $text = $prefix . "text";
+               $flags = $prefix . "flags";
+               if( isset( $row->$flags ) && (false !== strpos( $row->$flags, "gzip" ) ) ) {
+                       return gzinflate( $row->$text );
+               }
+               if( isset( $row->$text ) ) {
+                       return $row->$text;
+               }
+               return false;
+       }
+       
+       /* static */ function compressRevisionText( &$text ) {
+               global $wgCompressRevisions;
+               if( !$wgCompressRevisions ) {
+                       return "";
+               }
+               if( !function_exists( "gzdeflate" ) ) {
+                       wfDebug( "Article::compressRevisionText() -- no zlib support, not compressing\n" );
+                       return "";
+               }
+               $text = gzdeflate( $text );
+               return "gzip";
+       }
+       
        # Note that getContent/loadContent may follow redirects if
        # not told otherwise, and so may cause a change to mTitle.
 
+       # Return the text of this revision
        function getContent( $noredir = false )
        {
-               global $action,$section,$count; # From query string
-               $section = $_REQUEST["section"];
-               $count   = $_REQUEST['count'];
+               global $wgRequest;
+
+               # Get variables from query string :P
+               $action = $wgRequest->getText( 'action', 'view' );
+               $section = $wgRequest->getText( 'section' );
+
                $fname =  "Article::getContent"; 
                wfProfileIn( $fname );
 
@@ -91,29 +117,33 @@ 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";
-
-               # 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}";
-               }
+               
+               # 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;
@@ -135,30 +165,105 @@ class Article {
                                if ( preg_match( "/\\[\\[([^\\]\\|]+)[\\]\\|]/",
                                  $s->cur_text, $m ) ) {
                                        $rt = Title::newFromText( $m[1] );
+                                       if( $rt ) {
+                                               # Gotta hand redirects to special pages differently:
+                                               # Fill the HTTP response "Location" header and ignore
+                                               # the rest of the page we're on.
+       
+                                               if ( $rt->getInterwiki() != "" ) {
+                                                       $wgOut->redirect( $rt->getFullURL() ) ;
+                                                       return;
+                                               }
+                                               if ( $rt->getNamespace() == Namespace::getSpecial() ) {
+                                                       $wgOut->redirect( $rt->getFullURL() );
+                                                       return;
+                                               }
+                                               $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 );
+                                                       }
+                                               }
+                                       }
+                               }
+                       }
 
-                                       # Gotta hand redirects to special pages differently:
-                                       # Fill the HTTP response "Location" header and ignore
-                                       # the rest of the page we're on.
+                       $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; }
 
-                                       if ( $rt->getInterwiki() != "" ) {
-                                               $wgOut->redirect( $rt->getFullURL() ) ;
-                                               return;
-                                       }
-                                       if ( $rt->getNamespace() == Namespace::getSpecial() ) {
-                                               $wgOut->redirect( wfLocalUrl(
-                                                 $rt->getPrefixedURL() ) );
-                                               return;
-                                       }
-                                       $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 );
+                       $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;
+       }
+
+       # 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;
+                       }
+
+                       $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 );
+                                                       }
                                                }
                                        }
                                }
@@ -173,22 +278,31 @@ class Article {
                        $this->mTitle->mRestrictionsLoaded = true;
                        wfFreeResult( $res );
                } else { # oldid set, retrieve historical version
-                       $sql = "SELECT old_text,old_timestamp,old_user FROM old " .
+                       $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; }
+                       if ( 0 == wfNumRows( $res ) ) { 
+                               return false; 
+                       }
 
                        $s = wfFetchObject( $res );
-                       $this->mContent = $s->old_text;
+                       $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() { return $this->mTitle->getArticleID(); }
+       function getID() {
+               if( $this->mTitle ) {
+                       return $this->mTitle->getArticleID();
+               } else {
+                       return 0;
+               }
+       }
 
        function getCount()
        {
@@ -213,7 +327,7 @@ class Article {
                return 1;
        }
 
-       # Load the field related to the last edit time of the article.
+       # Loads everything from cur except cur_text
        # This isn't necessary for all uses, so it's only done if needed.
 
        /* private */ function loadLastEdit()
@@ -271,30 +385,38 @@ class Article {
 
        function view()
        {
-               global $wgUser, $wgOut, $wgLang;
-               global $oldid, $diff; # From query
-               global $wgLinkCache, $IP;
+               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 ) ) {
-                       if( $this->checkTouched() ) {
-                               $wgOut->checkLastModified( $this->mTouched );
-                               $this->tryFileCache();
+               if ( !is_null( $oldid ) and $this->checkTouched() ) {
+                       if( $wgOut->checkLastModified( $this->mTouched ) ){
+                               return;
+                       } else if ( $this->tryFileCache() ) {
+                               # tell wgOut that output is taken care of
+                               $wgOut->disable();
+                               $this->viewUpdates();
+                               return;
                        }
                }
 
@@ -305,7 +427,7 @@ class Article {
 
                # We're looking at an old revision
 
-               if ( $oldid ) {
+               if ( !empty( $oldid ) ) {
                        $this->setOldSubtitle();
                        $wgOut->setRobotpolicy( "noindex,follow" );
                }
@@ -316,10 +438,17 @@ class Article {
                        $s = wfMsg( "redirectedfrom", $redir );
                        $wgOut->setSubtitle( $s );
                }
-               $wgOut->checkLastModified( $this->mTouched );
-               $this->tryFileCache();
+
                $wgLinkCache->preFill( $this->mTitle );
-               $wgOut->addWikiText( $text );
+               
+               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 );
@@ -333,10 +462,12 @@ class Article {
        /* private */ function insertNewArticle( $text, $summary, $isminor, $watchthis )
        {
                global $wgOut, $wgUser, $wgLinkCache, $wgMwRedir;
-               global $wgEnablePersistentLC;
+               global $wgUseSquid, $wgDeferredUpdateList, $wgInternalServer;
                
                $fname = "Article::insertNewArticle";
 
+               $this->mCountAdjustment = $this->isCountable( $text );
+
                $ns = $this->mTitle->getNamespace();
                $ttl = $this->mTitle->getDBkey();
                $text = $this->preSaveTransform( $text );
@@ -347,6 +478,7 @@ class Article {
                $won = wfInvertTimestamp( $now );
                wfSeedRandom();
                $rand = number_format( mt_rand() / mt_getrandmax(), 12, ".", "" );
+               $isminor = ( $isminor && $wgUser->getID() ) ? 1 : 0;
                $sql = "INSERT INTO cur (cur_namespace,cur_title,cur_text," .
                  "cur_comment,cur_user,cur_timestamp,cur_minor_edit,cur_counter," .
                  "cur_restrictions,cur_user_text,cur_is_redirect," .
@@ -354,29 +486,16 @@ class Article {
                  wfStrencode( $text ) . "', '" .
                  wfStrencode( $summary ) . "', '" .
                  $wgUser->getID() . "', '{$now}', " .
-                 ( $isminor ? 1 : 0 ) . ", 0, '', '" .
+                 $isminor . ", 0, '', '" .
                  wfStrencode( $wgUser->getName() ) . "', $redir, 1, $rand, '{$now}', '{$won}')";
                $res = wfQuery( $sql, DB_WRITE, $fname );
 
                $newid = wfInsertId();
                $this->mTitle->resetArticleID( $newid );
 
-               if ( $wgEnablePersistentLC ) {
-                       // Purge related entries in links cache on new page, to heal broken links
-                       $ptitle = wfStrencode( $ttl );
-                       wfQuery("DELETE linkscc FROM linkscc,brokenlinks ".
-                               "WHERE lcc_pageid=bl_from AND bl_to='{$ptitle}'", DB_WRITE);
-               }
+               Article::onArticleCreate( $this->mTitle );
+               RecentChange::notifyNew( $now, $this->mTitle, $isminor, $wgUser, $summary );
                
-               $sql = "INSERT INTO recentchanges (rc_timestamp,rc_cur_time," .
-                 "rc_namespace,rc_title,rc_new,rc_minor,rc_cur_id,rc_user," .
-                 "rc_user_text,rc_comment,rc_this_oldid,rc_last_oldid,rc_bot) VALUES (" .
-                 "'{$now}','{$now}',{$ns},'" . wfStrencode( $ttl ) . "',1," .
-                 ( $isminor ? 1 : 0 ) . ",{$newid}," . $wgUser->getID() . ",'" .
-                 wfStrencode( $wgUser->getName() ) . "','" .
-                 wfStrencode( $summary ) . "',0,0," .
-                 ( $wgUser->isBot() ? 1 : 0 ) . ")";
-               wfQuery( $sql, DB_WRITE, $fname );
                if ($watchthis) {               
                        if(!$this->mTitle->userIsWatching()) $this->watch(); 
                } else {
@@ -390,21 +509,18 @@ class Article {
                $sql = "UPDATE cur set cur_touched='$now' WHERE cur_namespace=$talkns AND cur_title='" . wfStrencode( $ttl ) . "'";
                wfQuery( $sql, DB_WRITE );
                
+               # standard deferred updates
+               $this->editUpdates( $text );
+
                $this->showArticle( $text, wfMsg( "newarticle" ) );
        }
 
-       function updateArticle( $text, $summary, $minor, $watchthis, $section = "")
-       {
-               global $wgOut, $wgUser, $wgLinkCache;
-               global $wgDBtransactions, $wgMwRedir;
-               $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;
@@ -416,8 +532,18 @@ 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 ) { $me2 = 1; } else { $me2 = 0; }          
+               if ( $minor && $wgUser->getID() ) { $me2 = 1; } else { $me2 = 0; }              
                if ( preg_match( "/^((" . $wgMwRedir->getBaseRegex() . ")[^\\n]+)/i", $text, $m ) ) {
                        $redir = 1;
                        $text = $m[1] . "\n"; # Remove all content but redirect
@@ -455,9 +581,12 @@ class Article {
                                return false;
                        }
 
+                       # This overwrites $oldtext if revision compression is on
+                       $flags = Article::compressRevisionText( $oldtext );
+                       
                        $sql = "INSERT INTO old (old_namespace,old_title,old_text," .
                          "old_comment,old_user,old_user_text,old_timestamp," .
-                         "old_minor_edit,inverse_timestamp) VALUES (" .
+                         "old_minor_edit,inverse_timestamp,old_flags) VALUES (" .
                          $this->mTitle->getNamespace() . ", '" .
                          wfStrencode( $this->mTitle->getDBkey() ) . "', '" .
                          wfStrencode( $oldtext ) . "', '" .
@@ -465,46 +594,16 @@ class Article {
                          $this->getUser() . ", '" .
                          wfStrencode( $this->getUserText() ) . "', '" .
                          $this->getTimestamp() . "', " . $me1 . ", '" .
-                         wfInvertTimestamp( $this->getTimestamp() ) . "')";
+                         wfInvertTimestamp( $this->getTimestamp() ) . "','$flags')";
                        $res = wfQuery( $sql, DB_WRITE, $fname );
                        $oldid = wfInsertID( $res );
 
-                       $sql = "INSERT INTO recentchanges (rc_timestamp,rc_cur_time," .
-                         "rc_namespace,rc_title,rc_new,rc_minor,rc_bot,rc_cur_id,rc_user," .
-                         "rc_user_text,rc_comment,rc_this_oldid,rc_last_oldid) VALUES (" .
-                         "'{$now}','{$now}'," . $this->mTitle->getNamespace() . ",'" .
-                         wfStrencode( $this->mTitle->getDBkey() ) . "',0,{$me2}," .
-                         ( $wgUser->isBot() ? 1 : 0 ) . "," .
-                         $this->getID() . "," . $wgUser->getID() . ",'" .
-                         wfStrencode( $wgUser->getName() ) . "','" .
-                         wfStrencode( $summary ) . "',0,{$oldid})";
-                       wfQuery( $sql, DB_WRITE, $fname );
-
-                       $sql = "UPDATE recentchanges SET rc_this_oldid={$oldid} " .
-                         "WHERE rc_namespace=" . $this->mTitle->getNamespace() . " AND " .
-                         "rc_title='" . wfStrencode( $this->mTitle->getDBkey() ) . "' AND " .
-                         "rc_timestamp='" . $this->getTimestamp() . "'";
-                       wfQuery( $sql, DB_WRITE, $fname );
-
-                       $sql = "UPDATE recentchanges SET rc_cur_time='{$now}' " .
-                         "WHERE rc_cur_id=" . $this->getID();
-                       wfQuery( $sql, DB_WRITE, $fname );
-                       
-                       if ( $wgEnablePersistentLC ) {
-
-                               // Purge link cache for this page 
-                               $pageid=$this->getID();
-                               wfQuery("DELETE FROM linkscc WHERE lcc_pageid='{$pageid}'", DB_WRITE);
-
-                               // This next query just makes sure stub colored links to this page 
-                               // are updated correctly (I think). If performance is more important
-                               // than real-time updating of stub links, we really should skip
-                               // this query.
-                               wfQuery("DELETE linkscc FROM linkscc,links ".
-                                       "WHERE lcc_title=links.l_from AND l_to={$pageid}", DB_WRITE);
-                       }
-
+                       $bot = (int)($wgUser->isBot() || $forceBot);
+                       RecentChange::notifyEdit( $now, $this->mTitle, $me2, $wgUser, $summary, 
+                               $oldid, $this->getTimestamp(), $bot );
+                       Article::onArticleEdit( $this->mTitle );
                }
+
                if( $wgDBtransactions ) {
                        $sql = "COMMIT";
                        wfQuery( $sql, DB_WRITE );
@@ -517,6 +616,29 @@ class Article {
                                $this->unwatch();
                        }
                }
+               # standard deferred updates
+               $this->editUpdates( $text );
+               
+               
+               $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 ) {
+                       $urls = array_merge( $urls, $this->mTitle->getSquidURLs() );
+                       $u = new SquidUpdate( $urls );
+                       $u->doUpdate();
+               }
 
                $this->showArticle( $text, wfMsg( "updated" ) );
                return true;
@@ -527,27 +649,24 @@ class Article {
 
        function showArticle( $text, $subtitle )
        {
-               global $wgOut, $wgUser, $wgLinkCache, $wgUseBetterLinksUpdate;
+               global $wgOut, $wgUser, $wgLinkCache;
                global $wgMwRedir;
 
                $wgLinkCache = new LinkCache();
 
                # Get old version of link table to allow incremental link updates
-               if ( $wgUseBetterLinksUpdate ) {
-                       $wgLinkCache->preFill( $this->mTitle );
-                       $wgLinkCache->clear();
-               }
+               $wgLinkCache->preFill( $this->mTitle );
+               $wgLinkCache->clear();
 
                # Now update the link cache by parsing the text 
                $wgOut = new OutputPage();
                $wgOut->addWikiText( $text );
 
-               $this->editUpdates( $text );
                if( $wgMwRedir->matchStart( $text ) )
                        $r = "redirect=no";
                else
                        $r = "";
-               $wgOut->redirect( wfLocalUrl( $this->mTitle->getPrefixedURL(), $r ) );
+               $wgOut->redirect( $this->mTitle->getFullURL( $r ) );
        }
 
        # Add this page to my watchlist
@@ -593,76 +712,6 @@ class Article {
                $this->watch( false );
        }
 
-       # This shares a lot of issues (and code) with Recent Changes
-
-       function history()
-       {
-               global $wgUser, $wgOut, $wgLang, $offset, $limit;
-
-               # If page hasn't changed, client can cache this
-               
-               $wgOut->checkLastModified( $this->getTimestamp() );
-               $fname = "Article::history";
-               wfProfileIn( $fname );
-
-               $wgOut->setPageTitle( $this->mTitle->getPRefixedText() );
-               $wgOut->setSubtitle( wfMsg( "revhistory" ) );
-               $wgOut->setArticleFlag( false );
-               $wgOut->setRobotpolicy( "noindex,nofollow" );
-
-               if( $this->mTitle->getArticleID() == 0 ) {
-                       $wgOut->addHTML( wfMsg( "nohistory" ) );
-                       wfProfileOut( $fname );
-                       return;
-               }
-               
-               $offset = (int)$offset;
-               $limit = (int)$limit;
-               if( $limit == 0 ) $limit = 50;
-               $namespace = $this->mTitle->getNamespace();
-               $title = $this->mTitle->getText();
-               $sql = "SELECT old_id,old_user," .
-                 "old_comment,old_user_text,old_timestamp,old_minor_edit ".
-                 "FROM old USE INDEX (name_title_timestamp) " .
-                 "WHERE old_namespace={$namespace} AND " .
-                 "old_title='" . wfStrencode( $this->mTitle->getDBkey() ) . "' " .
-                 "ORDER BY inverse_timestamp LIMIT $offset, $limit";
-               $res = wfQuery( $sql, DB_READ, "Article::history" );
-
-               $revs = wfNumRows( $res );
-               if( $this->mTitle->getArticleID() == 0 ) {
-                       $wgOut->addHTML( wfMsg( "nohistory" ) );
-                       wfProfileOut( $fname );
-                       return;
-               }
-               
-               $sk = $wgUser->getSkin();
-               $numbar = wfViewPrevNext(
-                       $offset, $limit,
-                       $this->mTitle->getPrefixedText(),
-                       "action=history" );
-               $s = $numbar;
-               $s .= $sk->beginHistoryList();
-
-               if($offset == 0 )
-               $s .= $sk->historyLine( $this->getTimestamp(), $this->getUser(),
-                 $this->getUserText(), $namespace,
-                 $title, 0, $this->getComment(),
-                 ( $this->getMinorEdit() > 0 ) );
-
-               $revs = wfNumRows( $res );
-               while ( $line = wfFetchObject( $res ) ) {
-                       $s .= $sk->historyLine( $line->old_timestamp, $line->old_user,
-                         $line->old_user_text, $namespace,
-                         $title, $line->old_id,
-                         $line->old_comment, ( $line->old_minor_edit > 0 ) );
-               }
-               $s .= $sk->endHistoryList();
-               $s .= $numbar;
-               $wgOut->addHTML( $s );
-               wfProfileOut( $fname );
-       }
-
        function protect( $limit = "sysop" )
        {
                global $wgUser, $wgOut;
@@ -690,7 +739,7 @@ class Article {
                } else {
                        $log->addEntry( wfMsg( "protectedarticle", $this->mTitle->getPrefixedText() ), "" );
                }
-               $wgOut->redirect( wfLocalUrl( $this->mTitle->getPrefixedURL() ) );
+               $wgOut->redirect( $this->mTitle->getFullURL() );
        }
 
        function unprotect()
@@ -698,15 +747,17 @@ class Article {
                return $this->protect( "" );
        }
 
+       # UI entry point for page deletion 
        function delete()
        {
-               global $wgUser, $wgOut;
-               global $wpConfirm, $wpReason, $image, $oldimage;
-               $wpReason  = $_REQUEST["wpReason"];
-               $wpConfirm = $_REQUEST["wpConfirm"];
-
+               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;
@@ -724,35 +775,39 @@ class Article {
                        return;
                }
 
-               if ( $wpConfirm ) {
-                       $this->doDelete();
+               if ( $confirm ) {
+                       $this->doDelete( $reason );
                        return;
                }
 
                # determine whether this page has earlier revisions
                # and insert a warning if it does
                # we select the text because it might be useful below
-               $sql="SELECT old_text FROM old WHERE old_namespace=0 and old_title='" . wfStrencode($this->mTitle->getPrefixedDBkey())."' ORDER BY inverse_timestamp LIMIT 1";
-               $res=wfQuery($sql, DB_READ, $fname);
-               if( ($old=wfFetchObject($res)) && !$wpConfirm ) {
+               $ns = $this->mTitle->getNamespace();
+               $title = $this->mTitle->getDBkey();
+               $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)) && !$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=0 and cur_title='" . wfStrencode($this->mTitle->getPrefixedDBkey())."'";
+               $sql="SELECT cur_text FROM cur WHERE cur_namespace=$ns and cur_title='$etitle'";
                $res=wfQuery($sql, DB_READ, $fname);
                if( ($s=wfFetchObject($res))) {
 
                        # 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=$old->old_text;
-                                       $blanked=1;
+                                       $text = Article::getRevisionText( $old );
+                                       $blanked = true;
                                }
                                
                        }
@@ -761,10 +816,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
@@ -775,19 +831,20 @@ 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;
 
@@ -798,71 +855,114 @@ class Article {
                $wgOut->setRobotpolicy( "noindex,nofollow" );
                $wgOut->addWikiText( wfMsg( "confirmdeletetext" ) );
 
-               $t = $this->mTitle->getPrefixedURL();
-
-               $formaction = wfEscapeHTML( wfLocalUrl( $t, "action=delete" . $par ) );
-               $confirm = wfMsg( "confirm" );
-               $check = wfMsg( "confirmcheck" );
-               $delcom = wfMsg( "deletecomment" );
+               $formaction = $this->mTitle->escapeLocalURL( "action=delete" . $par );
+               
+               $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=\"{$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, $wpReason, $wgDeferredUpdateList;
+               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 ) {
+                       $urls = array(  
+                               $this->mTitle->getInternalURL(),
+                               $this->mTitle->getInternalURL( "history" ) 
+                       );
+                       foreach ( $linksTo as $linkTo ) {
+                               $urls[] = $linkTo->getInternalURL();
+                       }
+
+                       $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," .
@@ -894,75 +994,62 @@ 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() );
-
-                       if ( $wgEnablePersistentLC ) {
-                               // Purge related entries in links cache on delete,
-                               wfQuery("DELETE linkscc FROM linkscc,links ".
-                                       "WHERE lcc_title=links.l_from AND l_to={$id}", DB_WRITE);
-                               wfQuery("DELETE FROM linkscc WHERE lcc_title='{$t}'", DB_WRITE);
-                       }
-
-                       $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 ) ) {
-                               $nt = Title::newFromDBkey( $s->l_from );
-                               $lid = $nt->getArticleID();
-
-                               if ( ! $first ) { $sql .= ","; $sql2 .= ","; }
-                               $first = false;
-                               $sql .= "({$lid},'{$t}')";
-                               $sql2 .= "{$lid}";
-                       }
-                       $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='{$t}'";
-                       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='{$t}'";
-                       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 = wfCleanQueryVar( $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()
        {
-               global $wgUser, $wgLang, $wgOut, $from;
-               $from = $_REQUEST["from"];
+               global $wgUser, $wgLang, $wgOut, $wgRequest;
 
                if ( ! $wgUser->isSysop() ) {
                        $wgOut->sysopRequired();
                        return;
                }
-
+               if ( wfReadOnly() ) {
+                       $wgOut->readOnlyPage( $this->getContent() );
+                       return;
+               }
+               
+               # Enhanced rollback, marks edits rc_bot=1
+               $bot = $wgRequest->getBool( 'bot' );
+               
                # Replace all this user's current edits with the next one down
                $tt = wfStrencode( $this->mTitle->getDBKey() );
                $n = $this->mTitle->getNamespace();
@@ -980,7 +1067,7 @@ class Article {
                $uid = $s->cur_user;
                $pid = $s->cur_id;
                
-               $from = str_replace( '_', ' ', wfCleanQueryVar( $from ) );
+               $from = str_replace( '_', ' ', $wgRequest->getVal( "from" ) );
                if( $from != $s->cur_user_text ) {
                        $wgOut->setPageTitle(wfmsg("rollbackfailed"));
                        $wgOut->addWikiText( wfMsg( "alreadyrolled",
@@ -991,12 +1078,12 @@ class Article {
                                $wgOut->addHTML(
                                        wfMsg("editcomment",
                                        htmlspecialchars( $s->cur_comment ) ) );
-                               }
+                       }
                        return;
                }
                
                # Get the last edit not by this guy
-               $sql = "SELECT old_text,old_user,old_user_text
+               $sql = "SELECT old_text,old_user,old_user_text,old_timestamp,old_flags
                FROM old USE INDEX (name_title_timestamp)
                WHERE old_namespace={$n} AND old_title='{$tt}'
                AND (old_user <> {$uid} OR old_user_text <> '{$ut}')
@@ -1009,14 +1096,21 @@ class Article {
                        return;
                }
                $s = wfFetchObject( $res );
-       
+               
+               if ( $bot ) {
+                       # Mark all reverted edits as bot
+                       $sql = "UPDATE recentchanges SET rc_bot=1 WHERE
+                               rc_cur_id=$pid AND rc_user=$uid AND rc_timestamp > '{$s->old_timestamp}'";
+                       wfQuery( $sql, DB_WRITE, $fname );
+               }
+
                # Save it!
-               $newcomment = wfMsg( "revertpage", $s->old_user_text );
+               $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( $s->old_text, $newcomment, 1, $this->mTitle->userIsWatching() );
-
+               $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 );
        }
        
@@ -1026,12 +1120,10 @@ class Article {
        /* private */ function viewUpdates()
        {
                global $wgDeferredUpdateList;
-               
                if ( 0 != $this->getID() ) {
                        global $wgDisableCounters;
                        if( !$wgDisableCounters ) {
-                               $u = new ViewCountUpdate( $this->getID() );
-                               array_push( $wgDeferredUpdateList, $u );
+                               Article::incViewCount( $this->getID() );
                                $u = new SiteStatsUpdate( 1, 0, 0 );
                                array_push( $wgDeferredUpdateList, $u );
                        }
@@ -1047,6 +1139,7 @@ class Article {
        /* private */ function editUpdates( $text )
        {
                global $wgDeferredUpdateList, $wgDBname, $wgMemc;
+               global $wgMessageCache;
 
                wfSeedRandom();
                if ( 0 == mt_rand( 0, 999 ) ) {
@@ -1056,6 +1149,8 @@ class Article {
                }
                $id = $this->getID();
                $title = $this->mTitle->getPrefixedDBkey();
+               $shortTitle = $this->mTitle->getDBkey();
+               
                $adj = $this->mCountAdjustment;
 
                if ( 0 != $id ) {
@@ -1066,17 +1161,11 @@ class Article {
                        $u = new SearchUpdate( $id, $title, $text );
                        array_push( $wgDeferredUpdateList, $u );
 
-                       $u = new UserTalkUpdate( 1, $this->mTitle->getNamespace(),
-                         $this->mTitle->getDBkey() );
+                       $u = new UserTalkUpdate( 1, $this->mTitle->getNamespace(), $shortTitle );
                        array_push( $wgDeferredUpdateList, $u );
 
-                       if ( $this->getNamespace == NS_MEDIAWIKI ) {
-                               $messageCache = $wgMemc->get( "$wgDBname:messages" );
-                               if (!$messageCache) {
-                                       $messageCache = wfLoadAllMessages();
-                               }
-                               $messageCache[$title] = $text;
-                               $wgMemc->set( "$wgDBname:messages" );
+                       if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
+                               $wgMessageCache->replace( $shortTitle, $text );
                        }
                }
        }
@@ -1095,85 +1184,26 @@ class Article {
 
        function preSaveTransform( $text )
        {
-               $s = "";
-               while ( "" != $text ) {
-                       $p = preg_split( "/<\\s*nowiki\\s*>/i", $text, 2 );
-                       $s .= $this->pstPass2( $p[0] );
-
-                       if ( ( count( $p ) < 2 ) || ( "" == $p[1] ) ) { $text = ""; }
-                       else {
-                               $q = preg_split( "/<\\/\\s*nowiki\\s*>/i", $p[1], 2 );
-                               $s .= "<nowiki>{$q[0]}</nowiki>";
-                               $text = $q[1];
-                       }
-               }
-               return rtrim( $s );
-       }
-
-       /* private */ function pstPass2( $text )
-       {
-               global $wgUser, $wgLang, $wgLocaltimezone;
-
-               # Signatures
-               #
-               $n = $wgUser->getName();
-               $k = $wgUser->getOption( "nickname" );
-               if ( "" == $k ) { $k = $n; }
-               if(isset($wgLocaltimezone)) {
-                       $oldtz = getenv("TZ"); putenv("TZ=$wgLocaltimezone");
-               }
-               /* Note: this is an ugly timezone hack for the European wikis */
-               $d = $wgLang->timeanddate( date( "YmdHis" ), false ) .
-                 " (" . date( "T" ) . ")";
-               if(isset($wgLocaltimezone)) putenv("TZ=$oldtz");
-
-               $text = preg_replace( "/~~~~/", "[[" . $wgLang->getNsText(
-                 Namespace::getUser() ) . ":$n|$k]] $d", $text );
-               $text = preg_replace( "/~~~/", "[[" . $wgLang->getNsText(
-                 Namespace::getUser() ) . ":$n|$k]]", $text );
-
-               # Context links: [[|name]] and [[name (context)|]]
-               #
-               $tc = "[&;%\\-,.\\(\\)' _0-9A-Za-z\\/:\\x80-\\xff]";
-               $np = "[&;%\\-,.' _0-9A-Za-z\\/:\\x80-\\xff]"; # No parens
-               $namespacechar = '[ _0-9A-Za-z\x80-\xff]'; # Namespaces can use non-ascii!
-               $conpat = "/^({$np}+) \\(({$tc}+)\\)$/";
-
-               $p1 = "/\[\[({$np}+) \\(({$np}+)\\)\\|]]/";             # [[page (context)|]]
-               $p2 = "/\[\[\\|({$tc}+)]]/";                                    # [[|page]]
-               $p3 = "/\[\[($namespacechar+):({$np}+)\\|]]/";          # [[namespace:page|]]
-               $p4 = "/\[\[($namespacechar+):({$np}+) \\(({$np}+)\\)\\|]]/";
-                                                                                                               # [[ns:page (cont)|]]
-               $context = "";
-               $t = $this->mTitle->getText();
-               if ( preg_match( $conpat, $t, $m ) ) {
-                       $context = $m[2];
-               }
-               $text = preg_replace( $p4, "[[\\1:\\2 (\\3)|\\2]]", $text );
-               $text = preg_replace( $p1, "[[\\1 (\\2)|\\1]]", $text );
-               $text = preg_replace( $p3, "[[\\1:\\2|\\2]]", $text );
-
-               if ( "" == $context ) {
-                       $text = preg_replace( $p2, "[[\\1]]", $text );
-               } else {
-                       $text = preg_replace( $p2, "[[\\1 ({$context})|\\1]]", $text );
-               }
-               
-               # {{SUBST:xxx}} variables
-               #
-               $mw =& MagicWord::get( MAG_SUBST );
-               $text = $mw->substituteCallback( $text, "wfReplaceSubstVar" );
-
-               return $text;
+               global $wgParser, $wgUser;
+               return $wgParser->preSaveTransform( $text, $this->mTitle, $wgUser, ParserOptions::newFromUser( $wgUser ) );
        }
-
-       /* Caching functions */
        
+       /* Caching functions */
+
+       # 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() {
+               static $called = false;
+               if( $called ) {
+                       wfDebug( " tryFileCache() -- called twice!?\n" );
+                       return;
+               }
+               $called = true;
                if($this->isFileCacheable()) {
                        $touched = $this->mTouched;
-                       if( strpos( $this->mContent, "{{" ) !== false ) {
-                               # Expire pages with variable replacements in an hour
+                       if( $this->mTitle->getPrefixedDBkey() == wfMsg( "mainpage" ) ) {
+                               # Expire the main page quicker
                                $expire = wfUnix2Timestamp( time() - 3600 );
                                $touched = max( $expire, $touched );
                        }
@@ -1182,17 +1212,9 @@ class Article {
                                global $wgOut;
                                wfDebug( " tryFileCache() - about to load\n" );
                                $cache->loadFromFileCache();
-                               $wgOut->reportTime(); # For profiling
-                               exit;
+                               return true;
                        } else {
                                wfDebug( " tryFileCache() - starting buffer\n" );                       
-                               if($cache->useGzip() && wfClientAcceptsGzip()) {
-                                       /* For some reason, adding this header line over in
-                                          CacheManager::saveToFileCache() fails on my test
-                                          setup at home, though it works on the live install.
-                                          Make double-sure...  --brion */
-                                       header( "Content-Encoding: gzip" );
-                               }
                                ob_start( array(&$cache, 'saveToFileCache' ) );
                        }
                } else {
@@ -1201,14 +1223,15 @@ 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)
                        and ($wgUser->getId() == 0)
                        and (!$wgUser->getNewtalk())
-                       and ($this->mTitle->getNamespace != Namespace::getSpecial())
+                       and ($this->mTitle->getNamespace() != Namespace::getSpecial())
                        and ($action == "view")
                        and (!isset($oldid))
                        and (!isset($diff))
@@ -1228,10 +1251,105 @@ class Article {
                        return false;
                }
        }
-}
+       
+       /* static */ function incViewCount( $id )
+       {
+               $id = intval( $id );
+               global $wgHitcounterUpdateFreq;
+
+               if( $wgHitcounterUpdateFreq <= 1 ){ // 
+                       wfQuery("UPDATE cur SET cur_counter = cur_counter + 1 " .
+                               "WHERE cur_id = $id", DB_WRITE);
+                       return;
+               }
+
+               # Not important enough to warrant an error page in case of failure
+               $oldignore = wfIgnoreSQLErrors( true ); 
+
+               wfQuery("INSERT INTO hitcounter (hc_id) VALUES ({$id})", DB_WRITE);
+
+               $checkfreq = intval( $wgHitcounterUpdateFreq/25 + 1 );
+               if( (rand() % $checkfreq != 0) or (wfLastErrno() != 0) ){
+                       # Most of the time (or on SQL errors), skip row count check
+                       wfIgnoreSQLErrors( $oldignore );
+                       return;
+               }
+
+               $res = wfQuery("SELECT COUNT(*) as n FROM hitcounter", DB_WRITE);
+               $row = wfFetchObject( $res );
+               $rown = intval( $row->n );
+               if( $rown >= $wgHitcounterUpdateFreq ){ 
+                       wfProfileIn( "Article::incViewCount-collect" );
+                       $old_user_abort = ignore_user_abort( true );
+
+                       wfQuery("LOCK TABLES hitcounter WRITE", DB_WRITE);
+                       wfQuery("CREATE TEMPORARY TABLE acchits TYPE=HEAP ".
+                               "SELECT hc_id,COUNT(*) AS hc_n FROM hitcounter ".
+                               "GROUP BY hc_id", DB_WRITE);
+                       wfQuery("DELETE FROM hitcounter", DB_WRITE);
+                       wfQuery("UNLOCK TABLES", DB_WRITE);
+                       wfQuery("UPDATE cur,acchits SET cur_counter=cur_counter + hc_n ".
+                               "WHERE cur_id = hc_id", DB_WRITE);
+                       wfQuery("DROP TABLE acchits", DB_WRITE);
+
+                       ignore_user_abort( $old_user_abort );
+                       wfProfileOut( "Article::incViewCount-collect" );
+               }
+               wfIgnoreSQLErrors( $oldignore );
+       }
+
+       # The onArticle*() functions are supposed to be a kind of hooks
+       # which should be called whenever any of the specified actions 
+       # are done. 
+       #
+       # This is a good place to put code to clear caches, for instance. 
 
-function wfReplaceSubstVar( $matches ) {
-       return wfMsg( $matches[1] );
+       # This is called on page move and undelete, as well as edit     
+       /* static */ function onArticleCreate($title_obj){
+               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() );
+               }
+       }
+
+       /* static */ function onArticleDelete($title_obj){
+               global $wgEnablePersistentLC, $wgEnableParserCache;
+               if ( $wgEnablePersistentLC ) {
+                       LinkCache::linksccClearLinksTo( $title_obj->getArticleID() );
+               }
+               if ( $wgEnableParserCache ) {
+                       OutputPage::parsercacheClearLinksTo( $title_obj->getArticleID() );
+               }
+       }
+
+       /* static */ function onArticleEdit($title_obj){
+               global $wgEnablePersistentLC, $wgEnableParserCache;
+               if ( $wgEnablePersistentLC ) {
+                       LinkCache::linksccClearPage( $title_obj->getArticleID() );
+               }
+               if ( $wgEnableParserCache ) {
+                       OutputPage::parsercacheClearPage( $title_obj->getArticleID(), $title_obj->getNamespace() );
+               }
+       }
 }
 
 ?>