fixed prefixed links (for arabic wikipedia)
[lhc/web/wiklou.git] / includes / Article.php
index caf5773..7f1aacf 100644 (file)
@@ -1,4 +1,4 @@
-<?
+<?php
 # Class representing a Wikipedia article and history.
 # See design.doc for an overview.
 
@@ -12,110 +12,138 @@ class Article {
        /* private */ var $mUser, $mTimestamp, $mUserText;
        /* private */ var $mCounter, $mComment, $mCountAdjustment;
        /* private */ var $mMinorEdit, $mRedirectedFrom;
-       /* private */ var $mTouched, $mFileCache;
-
-       function Article() { $this->clear(); }
-
+       /* 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 newFromID( $newid )
-       {
-               global $wgOut, $wgTitle, $wgArticle;
-               $a = new Article();
-               $n = Article::nameOf( $newid );
-
-               $wgTitle = Title::newFromDBkey( $n );
-               $wgTitle->resetArticleID( $newid );
-
-               return $a;
+       /* 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 nameOf( $id )
-       {
-               $sql = "SELECT cur_namespace,cur_title FROM cur WHERE " .
-                 "cur_id={$id}";
-               $res = wfQuery( $sql, "Article::nameOf" );
-               if ( 0 == wfNumRows( $res ) ) { return NULL; }
-
-               $s = wfFetchObject( $res );
-               $n = Title::makeName( $s->cur_namespace, $s->cur_title );
-               return $n;
+       
+       /* 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 wgTitle.
+       # 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,$wgTitle; # From query string
-               wfProfileIn( "Article::getContent" );
+               global $wgRequest;
+
+               # Get variables from query string :P
+               $action = $wgRequest->getText( 'action', 'view' );
+               $section = $wgRequest->getText( 'section' );
+
+               $fname =  "Article::getContent"; 
+               wfProfileIn( $fname );
 
                if ( 0 == $this->getID() ) {
                        if ( "edit" == $action ) {
-                       
-                               global $wgTitle;
+                               wfProfileOut( $fname );
                                return ""; # was "newarticletext", now moved above the box)
-                               
-                               
                        }
-                       wfProfileOut();
+                       wfProfileOut( $fname );
                        return wfMsg( "noarticletext" );
                } else {
                        $this->loadContent( $noredir );
-                       wfProfileOut();
                                                
                        if(
                                # check if we're displaying a [[User talk:x.x.x.x]] anonymous talk page
-                               ( $wgTitle->getNamespace() == Namespace::getTalk( Namespace::getUser()) ) &&
-                                 preg_match("/^\d{1,3}\.\d{1,3}.\d{1,3}\.\d{1,3}$/",$wgTitle->getText()) &&
+                               ( $this->mTitle->getNamespace() == Namespace::getTalk( Namespace::getUser()) ) &&
+                                 preg_match("/^\d{1,3}\.\d{1,3}.\d{1,3}\.\d{1,3}$/",$this->mTitle->getText()) &&
                                  $action=="view"
                                ) 
                                {
+                               wfProfileOut( $fname );
                                return $this->mContent . "\n" .wfMsg("anontalkpagetext"); }
                        else {                          
                                if($action=="edit") {
                                        if($section!="") {
-                                               if($section=="new") { return ""; }
+                                               if($section=="new") { 
+                                                       wfProfileOut( $fname );
+                                                       return ""; 
+                                               }
 
                                                $secs=preg_split("/(^=+.*?=+|^<h[1-6].*?>.*?<\/h[1-6].*?>)/mi",
                                                 $this->mContent, -1,
                                                 PREG_SPLIT_DELIM_CAPTURE);
                                                if($section==0) {
+                                                       wfProfileOut( $fname );
                                                        return trim($secs[0]);
                                                } else {
+                                                       wfProfileOut( $fname );
                                                        return trim($secs[$section*2-1] . $secs[$section*2]);
                                                }
                                        }
                                }
+                               wfProfileOut( $fname );
                                return $this->mContent;
                        }
                }
        }
-
+       
+       # Load the revision (including cur_text) into this object
        function loadContent( $noredir = false )
        {
-               global $wgOut, $wgTitle;
-               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 = $wgTitle->getPrefixedText();
-               if ( $oldid ) { $t .= ",oldid={$oldid}"; }
-               if ( $redirect ) { $t .= ",redirect={$redirect}"; }
-               $this->mContent = str_replace( "$1", $t, wfMsg( "missingarticle" ) );
-
+               
+               # 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;
@@ -123,72 +151,158 @@ class Article {
                        $sql = "SELECT " .
                          "cur_text,cur_timestamp,cur_user,cur_counter,cur_restrictions,cur_touched " .
                          "FROM cur WHERE cur_id={$id}";
-                       $res = wfQuery( $sql, $fname );
-                       if ( 0 == wfNumRows( $res ) ) { return; }
+                       wfDebug( "$sql\n" );
+                       $res = wfQuery( $sql, DB_READ, $fname );
+                       if ( 0 == wfNumRows( $res ) ) { 
+                               return; 
+                       }
 
                        $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 ( ( "no" != $redirect ) && ( false == $noredir ) &&
-                         ( preg_match( "/^#redirect/i", $s->cur_text ) ) ) {
+                         ( $wgMwRedir->matchStart( $s->cur_text ) ) ) {
                                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 );
+                                                       }
+                                               }
+                                       }
+                               }
+                       }
+
+                       $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; }
 
-                                       # Gotta hand redirects to special pages differently:
-                                       # Fill the HTTP response "Location" header and ignore
-                                       # the rest of the page we're on.
+                       $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;
+       }
 
-                                       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_touched FROM cur WHERE cur_id={$rid}";
-                                               $res = wfQuery( $sql, $fname );
-
-                                               if ( 0 != wfNumRows( $res ) ) {
-                                                       $this->mRedirectedFrom = $wgTitle->getPrefixedText();
-                                                       $wgTitle = $rt;
-                                                       $s = wfFetchObject( $res );
+       # 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 );
+                                                       }
                                                }
                                        }
                                }
                        }
+
                        $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;
-                       $wgTitle->mRestrictions = explode( ",", trim( $s->cur_restrictions ) );
-                       $wgTitle->mRestrictionsLoaded = true;
+                       $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 FROM old " .
+                       $sql = "SELECT old_text,old_timestamp,old_user,old_flags FROM old " .
                          "WHERE old_id={$oldid}";
-                       $res = wfQuery( $sql, $fname );
-                       if ( 0 == wfNumRows( $res ) ) { return; }
+                       $res = wfQuery( $sql, DB_READ, $fname );
+                       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() { global $wgTitle; return $wgTitle->getArticleID(); }
+       function getID() {
+               if( $this->mTitle ) {
+                       return $this->mTitle->getArticleID();
+               } else {
+                       return 0;
+               }
+       }
 
        function getCount()
        {
@@ -204,16 +318,16 @@ class Article {
 
        function isCountable( $text )
        {
-               global $wgTitle, $wgUseCommaCount;
-
-               if ( 0 != $wgTitle->getNamespace() ) { return 0; }
-               if ( preg_match( "/^#redirect/i", $text ) ) { return 0; }
+               global $wgUseCommaCount, $wgMwRedir;
+               
+               if ( 0 != $this->mTitle->getNamespace() ) { return 0; }
+               if ( $wgMwRedir->matchStart( $text ) ) { return 0; }
                $token = ($wgUseCommaCount ? "," : "[[" );
                if ( false === strstr( $text, $token ) ) { return 0; }
                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()
@@ -224,7 +338,7 @@ class Article {
                $sql = "SELECT cur_user,cur_user_text,cur_timestamp," .
                  "cur_comment,cur_minor_edit FROM cur WHERE " .
                  "cur_id=" . $this->getID();
-               $res = wfQuery( $sql, "Article::loadLastEdit" );
+               $res = wfQuery( $sql, DB_READ, "Article::loadLastEdit" );
 
                if ( wfNumRows( $res ) > 0 ) {
                        $s = wfFetchObject( $res );
@@ -271,10 +385,15 @@ class Article {
 
        function view()
        {
-               global $wgUser, $wgOut, $wgTitle, $wgLang;
-               global $oldid, $diff; # From query
-               global $wgLinkCache;
-               wfProfileIn( "Article::view" );
+               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" );
@@ -282,21 +401,33 @@ class Article {
                # If we got diff and oldid in the query, we want to see a
                # diff page instead of the article.
 
-               if ( isset( $diff ) ) {
-                       $wgOut->setPageTitle( $wgTitle->getPrefixedText() );
-                       $de = new DifferenceEngine( $oldid, $diff );
+               if ( !is_null( $diff ) ) {
+                       $wgOut->setPageTitle( $this->mTitle->getPrefixedText() );
+                       $de = new DifferenceEngine( intval($oldid), intval($diff) );
                        $de->showDiffPage();
-                       wfProfileOut();
+                       wfProfileOut( $fname );
                        return;
                }
-               $text = $this->getContent(); # May change wgTitle!
-               $wgOut->setPageTitle( $wgTitle->getPrefixedText() );
-               $wgOut->setHTMLTitle( $wgTitle->getPrefixedText() .
+
+               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;
+                       }
+               }
+
+               $text = $this->getContent(); # May change mTitle
+               $wgOut->setPageTitle( $this->mTitle->getPrefixedText() );
+               $wgOut->setHTMLTitle( $this->mTitle->getPrefixedText() .
                  " - " . wfMsg( "wikititlesuffix" ) );
 
                # We're looking at an old revision
 
-               if ( $oldid ) {
+               if ( !empty( $oldid ) ) {
                        $this->setOldSubtitle();
                        $wgOut->setRobotpolicy( "noindex,follow" );
                }
@@ -304,24 +435,23 @@ class Article {
                        $sk = $wgUser->getSkin();
                        $redir = $sk->makeKnownLink( $this->mRedirectedFrom, "",
                          "redirect=no" );
-                       $s = str_replace( "$1", $redir, wfMsg( "redirectedfrom" ) );
+                       $s = wfMsg( "redirectedfrom", $redir );
                        $wgOut->setSubtitle( $s );
                }
-               $wgOut->checkLastModified( $this->mTouched );
-               $this->tryFileCache();
-               $wgLinkCache->preFill( $wgTitle );
-               $wgOut->addWikiText( $text );
 
-               # If the article we've just shown is in the "Image" namespace,
-               # follow it with the history list and link list for the image
-               # it describes.
-
-               if ( Namespace::getImage() == $wgTitle->getNamespace() ) {
-                       $this->imageHistory();
-                       $this->imageLinks();
+               $wgLinkCache->preFill( $this->mTitle );
+               
+               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();
+               wfProfileOut( $fname );
        }
 
        # Theoretically we could defer these whole insert and update
@@ -331,19 +461,24 @@ class Article {
 
        /* private */ function insertNewArticle( $text, $summary, $isminor, $watchthis )
        {
-               global $wgOut, $wgUser, $wgTitle, $wgLinkCache;
+               global $wgOut, $wgUser, $wgLinkCache, $wgMwRedir;
+               global $wgUseSquid, $wgDeferredUpdateList, $wgInternalServer;
+               
                $fname = "Article::insertNewArticle";
 
-               $ns = $wgTitle->getNamespace();
-               $ttl = $wgTitle->getDBkey();
+               $this->mCountAdjustment = $this->isCountable( $text );
+
+               $ns = $this->mTitle->getNamespace();
+               $ttl = $this->mTitle->getDBkey();
                $text = $this->preSaveTransform( $text );
-               if ( preg_match( "/^#redirect/i", $text ) ) { $redir = 1; }
+               if ( $wgMwRedir->matchStart( $text ) ) { $redir = 1; }
                else { $redir = 0; }
 
                $now = wfTimestampNow();
                $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," .
@@ -351,42 +486,41 @@ 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, $fname );
+               $res = wfQuery( $sql, DB_WRITE, $fname );
 
                $newid = wfInsertId();
-               $wgTitle->resetArticleID( $newid );
-
-               $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, $fname );
+               $this->mTitle->resetArticleID( $newid );
+
+               Article::onArticleCreate( $this->mTitle );
+               RecentChange::notifyNew( $now, $this->mTitle, $isminor, $wgUser, $summary );
+               
                if ($watchthis) {               
-                       if(!$wgTitle->userIsWatching()) $this->watch(); 
+                       if(!$this->mTitle->userIsWatching()) $this->watch(); 
                } else {
-                       if ( $wgTitle->userIsWatching() ) {
+                       if ( $this->mTitle->userIsWatching() ) {
                                $this->unwatch();
                        }
                }
                
+               # The talk page isn't in the regular link tables, so we need to update manually:
+               $talkns = $ns ^ 1; # talk -> normal; normal -> talk
+               $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, $wgTitle, $wgLinkCache;
-               global $wgDBtransactions;
-               $fname = "Article::updateArticle";
-               // insert updated section into old text if we have only edited part 
-               // of the article               
-               if ($section != "") {                   
-                       $oldtext=$this->getContent();
+
+       /* Side effects: loads last edit */
+       function getTextOfLastEditWithSectionReplacedOrAdded($section, $text, $summary = ""){
+               $this->loadLastEdit();
+               $oldtext = $this->getContent();
+               if ($section != "") {
                        if($section=="new") {
                                if($summary) $subject="== {$summary} ==\n\n";
                                $text=$oldtext."\n\n".$subject.$text;
@@ -398,14 +532,23 @@ 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 ( preg_match( "/^(#redirect[^\\n]+)/i", $text, $m ) ) {
+               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
                }
                else { $redir = 0; }
-               $this->loadLastEdit();
 
                $text = $this->preSaveTransform( $text );
                
@@ -413,7 +556,7 @@ class Article {
 
                if( $wgDBtransactions ) {
                        $sql = "BEGIN";
-                       wfQuery( $sql );
+                       wfQuery( $sql, DB_WRITE );
                }
                $oldtext = $this->getContent( true );
 
@@ -431,60 +574,71 @@ class Article {
                          "',cur_is_redirect={$redir}, cur_is_new=0, cur_touched='{$now}', inverse_timestamp='{$won}' " .
                          "WHERE cur_id=" . $this->getID() .
                          " AND cur_timestamp='" . $this->getTimestamp() . "'";
-                       $res = wfQuery( $sql, $fname );
+                       $res = wfQuery( $sql, DB_WRITE, $fname );
                        
                        if( wfAffectedRows() == 0 ) {
                                /* Belated edit conflict! Run away!! */
                                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 (" .
-                         $wgTitle->getNamespace() . ", '" .
-                         wfStrencode( $wgTitle->getDBkey() ) . "', '" .
+                         "old_minor_edit,inverse_timestamp,old_flags) VALUES (" .
+                         $this->mTitle->getNamespace() . ", '" .
+                         wfStrencode( $this->mTitle->getDBkey() ) . "', '" .
                          wfStrencode( $oldtext ) . "', '" .
                          wfStrencode( $this->getComment() ) . "', " .
                          $this->getUser() . ", '" .
                          wfStrencode( $this->getUserText() ) . "', '" .
                          $this->getTimestamp() . "', " . $me1 . ", '" .
-                         wfInvertTimestamp( $this->getTimestamp() ) . "')";
-                       $res = wfQuery( $sql, $fname );
+                         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}'," . $wgTitle->getNamespace() . ",'" .
-                         wfStrencode( $wgTitle->getDBkey() ) . "',0,{$me2}," .
-                         ( $wgUser->isBot() ? 1 : 0 ) . "," .
-                         $this->getID() . "," . $wgUser->getID() . ",'" .
-                         wfStrencode( $wgUser->getName() ) . "','" .
-                         wfStrencode( $summary ) . "',0,{$oldid})";
-                       wfQuery( $sql, $fname );
-
-                       $sql = "UPDATE recentchanges SET rc_this_oldid={$oldid} " .
-                         "WHERE rc_namespace=" . $wgTitle->getNamespace() . " AND " .
-                         "rc_title='" . wfStrencode( $wgTitle->getDBkey() ) . "' AND " .
-                         "rc_timestamp='" . $this->getTimestamp() . "'";
-                       wfQuery( $sql, $fname );
-
-                       $sql = "UPDATE recentchanges SET rc_cur_time='{$now}' " .
-                         "WHERE rc_cur_id=" . $this->getID();
-                       wfQuery( $sql, $fname );
+                       $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 );
+                       wfQuery( $sql, DB_WRITE );
                }
                
                if ($watchthis) { 
-                       if (!$wgTitle->userIsWatching()) $this->watch();                        
+                       if (!$this->mTitle->userIsWatching()) $this->watch();                   
                } else {
-                       if ( $wgTitle->userIsWatching() ) {
+                       if ( $this->mTitle->userIsWatching() ) {
                                $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;
@@ -495,95 +649,31 @@ class Article {
 
        function showArticle( $text, $subtitle )
        {
-               global $wgOut, $wgTitle, $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( $wgTitle );
-                       $wgLinkCache->clear();
-               }
+               $wgLinkCache->preFill( $this->mTitle );
+               $wgLinkCache->clear();
 
-               # Now update the link cache by parsing the text
+               # Now update the link cache by parsing the text 
+               $wgOut = new OutputPage();
                $wgOut->addWikiText( $text );
 
-               $this->editUpdates( $text );
-               if( preg_match( "/^#redirect/i", $text ) )
+               if( $wgMwRedir->matchStart( $text ) )
                        $r = "redirect=no";
                else
                        $r = "";
-               $wgOut->redirect( wfLocalUrl( $wgTitle->getPrefixedURL(), $r ) );
-       }
-
-       # If the page we've just displayed is in the "Image" namespace,
-       # we follow it with an upload history of the image and its usage.
-
-       function imageHistory()
-       {
-               global $wgUser, $wgOut, $wgLang, $wgTitle;
-               $fname = "Article::imageHistory";
-
-               $sql = "SELECT img_size,img_description,img_user," .
-                 "img_user_text,img_timestamp FROM image WHERE " .
-                 "img_name='" . wfStrencode( $wgTitle->getDBkey() ) . "'";
-               $res = wfQuery( $sql, $fname );
-
-               if ( 0 == wfNumRows( $res ) ) { return; }
-
-               $sk = $wgUser->getSkin();
-               $s = $sk->beginImageHistoryList();              
-
-               $line = wfFetchObject( $res );
-               $s .= $sk->imageHistoryLine( true, $line->img_timestamp,
-                 $wgTitle->getText(),  $line->img_user,
-                 $line->img_user_text, $line->img_size, $line->img_description );
-
-               $sql = "SELECT oi_size,oi_description,oi_user," .
-                 "oi_user_text,oi_timestamp,oi_archive_name FROM oldimage WHERE " .
-                 "oi_name='" . wfStrencode( $wgTitle->getDBkey() ) . "' " .
-                 "ORDER BY oi_timestamp DESC";
-               $res = wfQuery( $sql, $fname );
-
-               while ( $line = wfFetchObject( $res ) ) {
-                       $s .= $sk->imageHistoryLine( false, $line->oi_timestamp,
-                         $line->oi_archive_name, $line->oi_user,
-                         $line->oi_user_text, $line->oi_size, $line->oi_description );
-               }
-               $s .= $sk->endImageHistoryList();
-               $wgOut->addHTML( $s );
-       }
-
-       function imageLinks()
-       {
-               global $wgUser, $wgOut, $wgTitle;
-
-               $wgOut->addHTML( "<h2>" . wfMsg( "imagelinks" ) . "</h2>\n" );
-
-               $sql = "SELECT il_from FROM imagelinks WHERE il_to='" .
-                 wfStrencode( $wgTitle->getDBkey() ) . "'";
-               $res = wfQuery( $sql, "Article::imageLinks" );
-
-               if ( 0 == wfNumRows( $res ) ) {
-                       $wgOut->addHtml( "<p>" . wfMsg( "nolinkstoimage" ) . "\n" );
-                       return;
-               }
-               $wgOut->addHTML( "<p>" . wfMsg( "linkstoimage" ) .  "\n<ul>" );
-
-               $sk = $wgUser->getSkin();
-               while ( $s = wfFetchObject( $res ) ) {
-                       $name = $s->il_from;
-                       $link = $sk->makeKnownLink( $name, "" );
-                       $wgOut->addHTML( "<li>{$link}</li>\n" );
-               }
-               $wgOut->addHTML( "</ul>\n" );
+               $wgOut->redirect( $this->mTitle->getFullURL( $r ) );
        }
 
        # Add this page to my watchlist
 
-       function watch()
+       function watch( $add = true )
        {
-               global $wgUser, $wgTitle, $wgOut, $wgLang;
+               global $wgUser, $wgOut, $wgLang;
                global $wgDeferredUpdateList;
 
                if ( 0 == $wgUser->getID() ) {
@@ -594,17 +684,22 @@ class Article {
                        $wgOut->readOnlyPage();
                        return;
                }
-               $wgUser->addWatch( $wgTitle );
+               if( $add )
+                       $wgUser->addWatch( $this->mTitle );
+               else
+                       $wgUser->removeWatch( $this->mTitle );
 
-               $wgOut->setPagetitle( wfMsg( "addedwatch" ) );
+               $wgOut->setPagetitle( wfMsg( $add ? "addedwatch" : "removedwatch" ) );
                $wgOut->setRobotpolicy( "noindex,follow" );
 
                $sk = $wgUser->getSkin() ;
-               $link = $sk->makeKnownLink ( $wgTitle->getPrefixedText() ) ;
+               $link = $this->mTitle->getPrefixedText();
 
-               $text = str_replace( "$1", $link ,
-                 wfMsg( "addedwatchtext" ) );
-               $wgOut->addHTML( $text );
+               if($add)
+                       $text = wfMsg( "addedwatchtext", $link );
+               else
+                       $text = wfMsg( "removedwatchtext", $link );
+               $wgOut->addWikiText( $text );
 
                $up = new UserUpdate();
                array_push( $wgDeferredUpdateList, $up );
@@ -614,161 +709,130 @@ class Article {
 
        function unwatch()
        {
-               global $wgUser, $wgTitle, $wgOut, $wgLang;
-               global $wgDeferredUpdateList;
+               $this->watch( false );
+       }
 
-               if ( 0 == $wgUser->getID() ) {
-                       $wgOut->errorpage( "watchnologin", "watchnologintext" );
+       function protect( $limit = "sysop" )
+       {
+               global $wgUser, $wgOut, $wgRequest;
+
+               if ( ! $wgUser->isSysop() ) {
+                       $wgOut->sysopRequired();
                        return;
                }
                if ( wfReadOnly() ) {
                        $wgOut->readOnlyPage();
                        return;
                }
-               $wgUser->removeWatch( $wgTitle );
-
-               $wgOut->setPagetitle( wfMsg( "removedwatch" ) );
-               $wgOut->setRobotpolicy( "noindex,follow" );
+               $id = $this->mTitle->getArticleID();
+               if ( 0 == $id ) {
+                       $wgOut->fatalEror( wfMsg( "badarticleerror" ) );
+                       return;
+               }
 
-               $sk = $wgUser->getSkin() ;
-               $link = $sk->makeKnownLink ( $wgTitle->getPrefixedText() ) ;
+               $confirm = $wgRequest->getBool( 'wpConfirmProtect' ) && $wgRequest->wasPosted();
+               $reason = $wgRequest->getText( 'wpReasonProtect' );
 
-               $text = str_replace( "$1", $link ,
-                 wfMsg( "removedwatchtext" ) );
-               $wgOut->addHTML( $text );
+               if ( $confirm ) {
 
-               $up = new UserUpdate();
-               array_push( $wgDeferredUpdateList, $up );
+        $sql = "UPDATE cur SET cur_touched='" . wfTimestampNow() . "'," .
+                       "cur_restrictions='{$limit}' WHERE cur_id={$id}";
+               wfQuery( $sql, DB_WRITE, "Article::protect" );
 
-               $wgOut->returnToMain( false );
+               $log = new LogPage( wfMsg( "protectlogpage" ), wfMsg( "protectlogtext" ) );
+               if ( $limit === "" ) {
+                               $log->addEntry( wfMsg( "unprotectedarticle", $this->mTitle->getPrefixedText() ), $reason );
+               } else {
+                               $log->addEntry( wfMsg( "protectedarticle", $this->mTitle->getPrefixedText() ), $reason );
+               }
+               $wgOut->redirect( $this->mTitle->getFullURL() );
+                       return;
+               } else {
+                       $reason = htmlspecialchars( wfMsg( "protectreason" ) );
+                       return $this->confirmProtect( "", $reason, $limit );
+               }
        }
 
-       # This shares a lot of issues (and code) with Recent Changes
-
-       function history()
+               # Output protection confirmation dialog
+       function confirmProtect( $par, $reason, $limit = "sysop"  )
        {
-               global $wgUser, $wgOut, $wgLang, $wgTitle, $offset, $limit;
+               global $wgOut;
 
-               # If page hasn't changed, client can cache this
-               
-               $wgOut->checkLastModified( $this->getTimestamp() );
-               wfProfileIn( "Article::history" );
+               wfDebug( "Article::confirmProtect\n" );
 
-               $wgOut->setPageTitle( $wgTitle->getPRefixedText() );
-               $wgOut->setSubtitle( wfMsg( "revhistory" ) );
-               $wgOut->setArticleFlag( false );
+               $sub = htmlspecialchars( $this->mTitle->getPrefixedText() );
                $wgOut->setRobotpolicy( "noindex,nofollow" );
 
-               if( $wgTitle->getArticleID() == 0 ) {
-                       $wgOut->addHTML( wfMsg( "nohistory" ) );
-                       wfProfileOut();
-                       return;
-               }
-               
-               $offset = (int)$offset;
-               $limit = (int)$limit;
-               if( $limit == 0 ) $limit = 50;
-               $namespace = $wgTitle->getNamespace();
-               $title = $wgTitle->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( $wgTitle->getDBkey() ) . "' " .
-                 "ORDER BY inverse_timestamp LIMIT $offset, $limit";
-               $res = wfQuery( $sql, "Article::history" );
-
-               $revs = wfNumRows( $res );
-               if( $wgTitle->getArticleID() == 0 ) {
-                       $wgOut->addHTML( wfMsg( "nohistory" ) );
-                       wfProfileOut();
-                       return;
+               $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 );
                }
-               
-               $sk = $wgUser->getSkin();
-               $numbar = wfViewPrevNext(
-                       $offset, $limit,
-                       $wgTitle->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();
-       }
 
-       function protect()
-       {
-               global $wgUser, $wgOut, $wgTitle;
+               $confirm = htmlspecialchars( wfMsg( "confirm" ) );
 
-               if ( ! $wgUser->isSysop() ) {
-                       $wgOut->sysopRequired();
-                       return;
-               }
-               if ( wfReadOnly() ) {
-                       $wgOut->readOnlyPage();
-                       return;
-               }
-               $id = $wgTitle->getArticleID();
-               if ( 0 == $id ) {
-                       $wgOut->fatalEror( wfMsg( "badarticleerror" ) );
-                       return;
-               }
-        $sql = "UPDATE cur SET cur_touched='" . wfTimestampNow() . "'," .
-                 "cur_restrictions='sysop' WHERE cur_id={$id}";
-               wfQuery( $sql, "Article::protect" );
+               $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->redirect( wfLocalUrl( $wgTitle->getPrefixedURL() ) );
+               $wgOut->returnToMain( false );
        }
 
        function unprotect()
        {
-               global $wgUser, $wgOut, $wgTitle;
-
-               if ( ! $wgUser->isSysop() ) {
-                       $wgOut->sysopRequired();
-                       return;
-               }
-               if ( wfReadOnly() ) {
-                       $wgOut->readOnlyPage();
-                       return;
-               }
-               $id = $wgTitle->getArticleID();
-               if ( 0 == $id ) {
-                       $wgOut->fatalEror( wfMsg( "badarticleerror" ) );
-                       return;
-               }
-               $sql = "UPDATE cur SET cur_touched='" . wfTimestampNow() . "'," .
-                 "cur_restrictions='' WHERE cur_id={$id}";
-               wfQuery( $sql, "Article::unprotect" );
-
-               $wgOut->redirect( wfLocalUrl( $wgTitle->getPrefixedURL() ) );
+               return $this->protect( "" );
        }
 
+       # UI entry point for page deletion 
        function delete()
        {
-               global $wgUser, $wgOut, $wgTitle;
-               global $wpConfirm, $wpReason, $image, $oldimage;
-
-               # Anybody can delete old revisions of images; only sysops
-               # can delete articles and current images
-
-               if ( ( ! $oldimage ) && ( ! $wgUser->isSysop() ) ) {
+               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;
                }
@@ -779,208 +843,200 @@ class Article {
 
                # Better double-check that it hasn't been deleted yet!
                $wgOut->setPagetitle( wfMsg( "confirmdelete" ) );
-               if ( $image ) {
-                       if ( "" == trim( $image ) ) {
-                               $wgOut->fatalError( wfMsg( "cannotdelete" ) );
-                               return;
-                       }
-                       $sub = str_replace( "$1", $image, wfMsg( "deletesub" ) );                       
-               } else {
+               if ( ( "" == trim( $this->mTitle->getText() ) )
+                 or ( $this->mTitle->getArticleId() == 0 ) ) {
+                       $wgOut->fatalError( wfMsg( "cannotdelete" ) );
+                       return;
+               }
 
-                       if ( ( "" == trim( $wgTitle->getText() ) )
-                         or ( $wgTitle->getArticleId() == 0 ) ) {
-                               $wgOut->fatalError( wfMsg( "cannotdelete" ) );
-                               return;
-                       }
-                       $sub = str_replace( "$1", $wgTitle->getPrefixedText(),
-                         wfMsg( "deletesub" ) );                       
-
-                       # 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($wgTitle->getPrefixedDBkey())."' ORDER BY inverse_timestamp LIMIT 1";
-                       $res=wfQuery($sql,$fname);
-                       if( ($old=wfFetchObject($res)) && !$wpConfirm ) {
-                               $skin=$wgUser->getSkin();
-                               $wgOut->addHTML("<B>".wfMsg("historywarning"));
-                               $wgOut->addHTML( $skin->historyLink() ."</B><P>");
-                       }
+               if ( $confirm ) {
+                       $this->doDelete( $reason );
+                       return;
+               }
 
-                       $sql="SELECT cur_text FROM cur WHERE cur_namespace=0 and cur_title='" . wfStrencode($wgTitle->getPrefixedDBkey())."'";
-                       $res=wfQuery($sql,$fname);
-                       if( ($s=wfFetchObject($res))) {
+               # determine whether this page has earlier revisions
+               # and insert a warning if it does
+               # we select the text because it might be useful below
+               $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>");
+               }
 
-                               # if this is a mini-text, we can paste part of it into the deletion reason
+               $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 empty, an earlier revision may contain "useful" text
-                               if($s->cur_text!="") {
-                                       $text=$s->cur_text;
-                               } else {
-                                       if($old) {
-                                               $text=$old->old_text;
-                                               $blanked=1;
-                                       }
-                                       
+                       # 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 = true;
                                }
                                
-                               $length=strlen($text);                          
-                               
-                               # 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 < 500 && !$wpReason) {
-                                                                               
-                                       # comment field=255, let's grep the first 150 to have some user
-                                       # space left
-                                       $text=substr($text,0,150);
-                                       # let's strip out newlines and HTML tags
-                                       $text=preg_replace("/\"/","'",$text);
-                                       $text=preg_replace("/\</","&lt;",$text);
-                                       $text=preg_replace("/\>/","&gt;",$text);
-                                       $text=preg_replace("/[\n\r]/","",$text);
-                                       if(!$blanked) {
-                                               $wpReason=wfMsg("excontent"). " '".$text;
-                                       } else {
-                                               $wpReason=wfMsg("exbeforeblank") . " '".$text;
-                                       }
-                                       if($length>150) { $wpReason .= "..."; } # we've only pasted part of the text
-                                       $wpReason.="'"; 
+                       }
+                       
+                       $length=strlen($text);                          
+                       
+                       # 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 && $reason === "") { 
+                               $reason = wfMsg("exblank");
+                       }
+                       
+                       if($length < 500 && $reason === "") {
+                                                                       
+                               # comment field=255, let's grep the first 150 to have some user
+                               # space left
+                               $text=substr($text,0,150);
+                               # let's strip out newlines and HTML tags
+                               $text=preg_replace("/\"/","'",$text);
+                               $text=preg_replace("/\</","&lt;",$text);
+                               $text=preg_replace("/\>/","&gt;",$text);
+                               $text=preg_replace("/[\n\r]/","",$text);
+                               if(!$blanked) {
+                                       $reason=wfMsg("excontent"). " '".$text;
+                               } else {
+                                       $reason=wfMsg("exbeforeblank") . " '".$text;
                                }
+                               if($length>150) { $reason .= "..."; } # we've only pasted part of the text
+                               $reason.="'"; 
                        }
-
                }
 
-               # Likewise, deleting old images doesn't require confirmation
-               if ( $oldimage || 1 == $wpConfirm ) {
-                       $this->doDelete();
-                       return;
-               }
+               return $this->confirmDelete( "", $reason );
+       }
+       
+       # Output deletion confirmation dialog
+       function confirmDelete( $par, $reason )
+       {
+               global $wgOut;
 
-               $wgOut->setSubtitle( $sub );
+               wfDebug( "Article::confirmDelete\n" );
+               
+               $sub = htmlspecialchars( $this->mTitle->getPrefixedText() );
+               $wgOut->setSubtitle( wfMsg( "deletesub", $sub ) );
                $wgOut->setRobotpolicy( "noindex,nofollow" );
                $wgOut->addWikiText( wfMsg( "confirmdeletetext" ) );
 
-               $t = $wgTitle->getPrefixedURL();
-               $q = "action=delete";
-
-               if ( $image ) {
-                       $q .= "&image={$image}";
-               } else if ( $oldimage ) {
-                       $q .= "&oldimage={$oldimage}";
-               } else {
-                       $q .= "&title={$t}";
-               }
-               $formaction = wfEscapeHTML( wfLocalUrl( "", $q ) );
-               $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'>
-</td><td>{$check}</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, $wgTitle, $wgUser, $wgLang;
-               global $image, $oldimage, $wpReason;
+               global $wgOut, $wgUser, $wgLang;
                $fname = "Article::doDelete";
+               wfDebug( "$fname\n" );
 
-               if ( $image ) {
-                       $dest = wfImageDir( $image );
-                       $archive = wfImageDir( $image );
-                       if ( ! unlink( "{$dest}/{$image}" ) ) {
-                               $wgOut->fileDeleteError( "{$dest}/{$image}" );
-                               return;
-                       }
-                       $sql = "DELETE FROM image WHERE img_name='" .
-                         wfStrencode( $image ) . "'";
-                       wfQuery( $sql, $fname );
-
-                       $sql = "SELECT oi_archive_name FROM oldimage WHERE oi_name='" .
-                         wfStrencode( $image ) . "'";
-                       $res = wfQuery( $sql, $fname );
-
-                       while ( $s = wfFetchObject( $res ) ) {
-                               $this->doDeleteOldImage( $s->oi_archive_name );
-                       }       
-                       $sql = "DELETE FROM oldimage WHERE oi_name='" .
-                         wfStrencode( $image ) . "'";
-                       wfQuery( $sql, $fname );
-
-                       # Image itself is now gone, and database is cleaned.
-                       # Now we remove the image description page.
-
-                       $nt = Title::newFromText( $wgLang->getNsText( Namespace::getImage() ) . ":" . $image );
-                       $this->doDeleteArticle( $nt );
-
-                       $deleted = $image;
-               } else if ( $oldimage ) {
-                       $this->doDeleteOldImage( $oldimage );
-                       $sql = "DELETE FROM oldimage WHERE oi_archive_name='" .
-                         wfStrencode( $oldimage ) . "'";
-                       wfQuery( $sql, $fname );
-
-                       $deleted = $oldimage;
-               } else {
-                       $this->doDeleteArticle( $wgTitle );
-                       $deleted = $wgTitle->getPrefixedText();
-               }
-               $wgOut->setPagetitle( wfMsg( "actioncomplete" ) );
-               $wgOut->setRobotpolicy( "noindex,nofollow" );
+               if ( $this->doDeleteArticle( $reason ) ) {      
+                       $deleted = $this->mTitle->getPrefixedText();
 
-               $sk = $wgUser->getSkin();
-               $loglink = $sk->makeKnownLink( $wgLang->getNsText(
-                 Namespace::getWikipedia() ) .
-                 ":" . wfMsg( "dellogpage" ), wfMsg( "deletionlog" ) );
+                       $wgOut->setPagetitle( wfMsg( "actioncomplete" ) );
+                       $wgOut->setRobotpolicy( "noindex,nofollow" );
 
-               $text = str_replace( "$1" , $deleted, wfMsg( "deletedtext" ) );
-               $text = str_replace( "$2", $loglink, $text );
+                       $sk = $wgUser->getSkin();
+                       $loglink = $sk->makeKnownLink( $wgLang->getNsText(
+                         Namespace::getWikipedia() ) .
+                         ":" . wfMsg( "dellogpage" ), wfMsg( "deletionlog" ) );
 
-               $wgOut->addHTML( "<p>" . $text );
-               $wgOut->returnToMain( false );
-       }
+                       $text = wfMsg( "deletedtext", $deleted, $loglink );
 
-       function doDeleteOldImage( $oldimage )
-       {
-               global $wgOut;
-
-               $name = substr( $oldimage, 15 );
-               $archive = wfImageArchiveDir( $name );
-               if ( ! unlink( "{$archive}/{$oldimage}" ) ) {
-                       $wgOut->fileDeleteError( "{$archive}/{$oldimage}" );
+                       $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, $wgTitle, $wgDeferredUpdateList;
+               global $wgUser, $wgLang;
+               global  $wgUseSquid, $wgDeferredUpdateList, $wgInternalServer;
 
                $fname = "Article::doDeleteArticle";
-               $ns = $title->getNamespace();
-               $t = wfStrencode( $title->getDBkey() );
-               $id = $title->getArticleID();
+               wfDebug( "$fname\n" );
 
-               if ( "" == $t ) {
-                       $wgOut->fatalError( wfMsg( "cannotdelete" ) );
-                       return;
+               $ns = $this->mTitle->getNamespace();
+               $t = wfStrencode( $this->mTitle->getDBkey() );
+               $id = $this->mTitle->getArticleID();
+
+               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," .
@@ -988,138 +1044,93 @@ class Article {
                  "ar_flags) SELECT cur_namespace,cur_title,cur_text,cur_comment," .
                  "cur_user,cur_user_text,cur_timestamp,cur_minor_edit,0 FROM cur " .
                  "WHERE cur_namespace={$ns} AND cur_title='{$t}'";
-               wfQuery( $sql, $fname );
+               wfQuery( $sql, DB_WRITE, $fname );
 
                $sql = "INSERT INTO archive (ar_namespace,ar_title,ar_text," .
                  "ar_comment,ar_user,ar_user_text,ar_timestamp,ar_minor_edit," .
                  "ar_flags) SELECT old_namespace,old_title,old_text,old_comment," .
                  "old_user,old_user_text,old_timestamp,old_minor_edit,old_flags " .
                  "FROM old WHERE old_namespace={$ns} AND old_title='{$t}'";
-               wfQuery( $sql, $fname );
+               wfQuery( $sql, DB_WRITE, $fname );
 
                # Now that it's safely backed up, delete it
 
                $sql = "DELETE FROM cur WHERE cur_namespace={$ns} AND " .
                  "cur_title='{$t}'";
-               wfQuery( $sql, $fname );
+               wfQuery( $sql, DB_WRITE, $fname );
 
                $sql = "DELETE FROM old WHERE old_namespace={$ns} AND " .
                  "old_title='{$t}'";
-               wfQuery( $sql, $fname );
+               wfQuery( $sql, DB_WRITE, $fname );
                
                $sql = "DELETE FROM recentchanges WHERE rc_namespace={$ns} AND " .
                  "rc_title='{$t}'";
-        wfQuery( $sql, $fname );
+                       wfQuery( $sql, DB_WRITE, $fname );
 
                # Finally, clean up the link tables
+               $t = wfStrencode( $this->mTitle->getPrefixedDBkey() );
 
-               if ( 0 != $id ) {
-                       $t = wfStrencode( $title->getPrefixedDBkey() );
-                       $sql = "SELECT l_from FROM links WHERE l_to={$id}";
-                       $res = wfQuery( $sql, $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, $fname );
-                               wfQuery( $sql2, $fname );
-                       }
-                       wfFreeResult( $res );
+               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_to={$id}";
-                       wfQuery( $sql, $fname );
+               $sql = "DELETE FROM links WHERE l_to={$id}";
+               wfQuery( $sql, DB_WRITE, $fname );
 
-                       $sql = "DELETE FROM links WHERE l_from='{$t}'";
-                       wfQuery( $sql, $fname );
+               $sql = "DELETE FROM links WHERE l_from={$id}";
+               wfQuery( $sql, DB_WRITE, $fname );
 
-                       $sql = "DELETE FROM imagelinks WHERE il_from='{$t}'";
-                       wfQuery( $sql, $fname );
+               $sql = "DELETE FROM imagelinks WHERE il_from={$id}";
+               wfQuery( $sql, DB_WRITE, $fname );
 
-                       $sql = "DELETE FROM brokenlinks WHERE bl_from={$id}";
-                       wfQuery( $sql, $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( str_replace( "$1", $art, wfMsg( "deletedarticle" ) ), $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
-               $wgTitle->resetArticleID( 0 );
-               $wgTitle->mArticleID = 0;
-       }
-
-       function revert()
-       {
-               global $wgOut;
-               global $oldimage;
-
-               if ( strlen( $oldimage ) < 16 ) {
-                       $wgOut->unexpectedValueError( "oldimage", $oldimage );
-                       return;
-               }
-               if ( wfReadOnly() ) {
-                       $wgOut->readOnlyPage();
-                       return;
-               }
-               $name = substr( $oldimage, 15 );
-
-               $dest = wfImageDir( $name );
-               $archive = wfImageArchiveDir( $name );
-               $curfile = "{$dest}/{$name}";
-
-               if ( ! is_file( $curfile ) ) {
-                       $wgOut->fileNotFoundError( $curfile );
-                       return;
-               }
-               $oldver = wfTimestampNow() . "!{$name}";
-               $size = wfGetSQL( "oldimage", "oi_size", "oi_archive_name='" .
-                 wfStrencode( $oldimage ) . "'" );
-
-               if ( ! rename( $curfile, "${archive}/{$oldver}" ) ) {
-                       $wgOut->fileRenameError( $curfile, "${archive}/{$oldver}" );
-                       return;
-               }
-               if ( ! copy( "{$archive}/{$oldimage}", $curfile ) ) {
-                       $wgOut->fileCopyError( "${archive}/{$oldimage}", $curfile );
-               }
-               wfRecordUpload( $name, $oldver, $size, wfMsg( "reverted" ) );
-
-               $wgOut->setPagetitle( wfMsg( "actioncomplete" ) );
-               $wgOut->setRobotpolicy( "noindex,nofollow" );
-               $wgOut->addHTML( wfMsg( "imagereverted" ) );
-               $wgOut->returnToMain( false );
+               $this->mTitle->resetArticleID( 0 );
+               $this->mTitle->mArticleID = 0;
+               return true;
        }
 
        function rollback()
        {
-               global $wgUser, $wgTitle, $wgLang, $wgOut, $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( $wgTitle->getDBKey() );
-               $n = $wgTitle->getNamespace();
+               $tt = wfStrencode( $this->mTitle->getDBKey() );
+               $n = $this->mTitle->getNamespace();
                
                # Get the last editor
                $sql = "SELECT cur_id,cur_user,cur_user_text,cur_comment FROM cur WHERE cur_title='{$tt}' AND cur_namespace={$n}";
-               $res = wfQuery( $sql );
+               $res = wfQuery( $sql, DB_READ );
                if( ($x = wfNumRows( $res )) != 1 ) {
                        # Something wrong
                        $wgOut->addHTML( wfMsg( "notanarticle" ) );
@@ -1130,28 +1141,28 @@ 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",
-                               htmlspecialchars( $wgTitle->getPrefixedText()),
+                               htmlspecialchars( $this->mTitle->getPrefixedText()),
                                htmlspecialchars( $from ),
                                htmlspecialchars( $s->cur_user_text ) ) );
                        if($s->cur_comment != "") {
                                $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}')
                ORDER BY inverse_timestamp LIMIT 1";
-               $res = wfQuery( $sql );
+               $res = wfQuery( $sql, DB_READ );
                if( wfNumRows( $res ) != 1 ) {
                        # Something wrong
                        $wgOut->setPageTitle(wfMsg("rollbackfailed"));
@@ -1159,14 +1170,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 = str_replace( "$1", $s->old_user_text, wfMsg( "revertpage" ) );
+               $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, $wgTitle->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 );
        }
        
@@ -1175,16 +1193,16 @@ class Article {
 
        /* private */ function viewUpdates()
        {
-               global $wgDeferredUpdateList, $wgTitle;
-
+               global $wgDeferredUpdateList;
                if ( 0 != $this->getID() ) {
-                       $u = new ViewCountUpdate( $this->getID() );
-                       array_push( $wgDeferredUpdateList, $u );
-                       $u = new SiteStatsUpdate( 1, 0, 0 );
-                       array_push( $wgDeferredUpdateList, $u );
-
-                       $u = new UserTalkUpdate( 0, $wgTitle->getNamespace(),
-                         $wgTitle->getDBkey() );
+                       global $wgDisableCounters;
+                       if( !$wgDisableCounters ) {
+                               Article::incViewCount( $this->getID() );
+                               $u = new SiteStatsUpdate( 1, 0, 0 );
+                               array_push( $wgDeferredUpdateList, $u );
+                       }
+                       $u = new UserTalkUpdate( 0, $this->mTitle->getNamespace(),
+                         $this->mTitle->getDBkey() );
                        array_push( $wgDeferredUpdateList, $u );
                }
        }
@@ -1194,16 +1212,19 @@ class Article {
 
        /* private */ function editUpdates( $text )
        {
-               global $wgDeferredUpdateList, $wgTitle;
+               global $wgDeferredUpdateList, $wgDBname, $wgMemc;
+               global $wgMessageCache;
 
                wfSeedRandom();
                if ( 0 == mt_rand( 0, 999 ) ) {
                        $cutoff = wfUnix2Timestamp( time() - ( 7 * 86400 ) );
                        $sql = "DELETE FROM recentchanges WHERE rc_timestamp < '{$cutoff}'";
-                       wfQuery( $sql );
+                       wfQuery( $sql, DB_WRITE );
                }
                $id = $this->getID();
-               $title = $wgTitle->getPrefixedDBkey();
+               $title = $this->mTitle->getPrefixedDBkey();
+               $shortTitle = $this->mTitle->getDBkey();
+               
                $adj = $this->mCountAdjustment;
 
                if ( 0 != $id ) {
@@ -1214,9 +1235,12 @@ class Article {
                        $u = new SearchUpdate( $id, $title, $text );
                        array_push( $wgDeferredUpdateList, $u );
 
-                       $u = new UserTalkUpdate( 1, $wgTitle->getNamespace(),
-                         $wgTitle->getDBkey() );
+                       $u = new UserTalkUpdate( 1, $this->mTitle->getNamespace(), $shortTitle );
                        array_push( $wgDeferredUpdateList, $u );
+
+                       if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
+                               $wgMessageCache->replace( $shortTitle, $text );
+                       }
                }
        }
 
@@ -1225,7 +1249,7 @@ class Article {
                global $wgLang, $wgOut;
 
                $td = $wgLang->timeanddate( $this->mTimestamp, true );
-               $r = str_replace( "$1", "{$td}", wfMsg( "revisionasof" ) );
+               $r = wfMsg( "revisionasof", $td );
                $wgOut->setSubtitle( "({$r})" );
        }
 
@@ -1234,102 +1258,37 @@ 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 );
+               global $wgParser, $wgUser;
+               return $wgParser->preSaveTransform( $text, $this->mTitle, $wgUser, ParserOptions::newFromUser( $wgUser ) );
        }
-
-       /* private */ function pstPass2( $text )
-       {
-               global $wgUser, $wgLang, $wgTitle, $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
-               $conpat = "/^({$np}+) \\(({$tc}+)\\)$/";
-
-               $p1 = "/\[\[({$np}+) \\(({$np}+)\\)\\|]]/";             # [[page (context)|]]
-               $p2 = "/\[\[\\|({$tc}+)]]/";                                    # [[|page]]
-               $p3 = "/\[\[([A-Za-z _]+):({$np}+)\\|]]/";              # [[namespace:page|]]
-               $p4 = "/\[\[([A-Aa-z _]+):({$np}+) \\(({$np}+)\\)\\|]]/";
-                                                                                                               # [[ns:page (cont)|]]
-               $context = "";
-               $t = $wgTitle->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 );
-               }
-               # Replace local image links with new [[image:]] style
-
-               $text = preg_replace(
-                 "/(^|[^[])http:\/\/(www.|)wikipedia.com\/upload\/" .
-                 "([a-zA-Z0-9_:.~\%\-]+)\.(png|PNG|jpg|JPG|jpeg|JPEG|gif|GIF)/",
-                 "\\1[[image:\\3.\\4]]", $text );
-               $text = preg_replace(
-                 "/(^|[^[])http:\/\/(www.|)wikipedia.com\/images\/uploads\/" .
-                 "([a-zA-Z0-9_:.~\%\-]+)\.(png|PNG|jpg|JPG|jpeg|JPEG|gif|GIF)/",
-                 "\\1[[image:\\3.\\4]]", $text );
-
-               return $text;
-       }
-
-       /* 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() {
-               global $wgTitle;
-               
+               static $called = false;
+               if( $called ) {
+                       wfDebug( " tryFileCache() -- called twice!?\n" );
+                       return;
+               }
+               $called = true;
                if($this->isFileCacheable()) {
-                       $cache = new CacheManager( $wgTitle );
-                       if($cache->isFileCacheGood( $this->mTouched )) {
+                       $touched = $this->mTouched;
+                       if( $this->mTitle->getPrefixedDBkey() == wfMsg( "mainpage" ) ) {
+                               # Expire the main page quicker
+                               $expire = wfUnix2Timestamp( time() - 3600 );
+                               $touched = max( $expire, $touched );
+                       }
+                       $cache = new CacheManager( $this->mTitle );
+                       if($cache->isFileCacheGood( $touched )) {
+                               global $wgOut;
                                wfDebug( " tryFileCache() - about to load\n" );
                                $cache->loadFromFileCache();
-                               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 {
@@ -1338,23 +1297,133 @@ class Article {
        }
 
        function isFileCacheable() {
-               global $wgUser, $wgTitle, $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 ($wgTitle->getNamespace != Namespace::getSpecial())
+                       and ($this->mTitle->getNamespace() != Namespace::getSpecial())
                        and ($action == "view")
                        and (!isset($oldid))
                        and (!isset($diff))
                        and (!isset($redirect))
                        and (!isset($printable))
                        and (!$this->mRedirectedFrom);
-                       
        }
        
+       function checkTouched() {
+               $id = $this->getID();
+               $sql = "SELECT cur_touched,cur_is_redirect FROM cur WHERE cur_id=$id";
+               $res = wfQuery( $sql, DB_READ, "Article::checkTouched" );
+               if( $s = wfFetchObject( $res ) ) {
+                       $this->mTouched = $s->cur_touched;
+                       return !$s->cur_is_redirect;
+               } else {
+                       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. 
+
+       # 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() );
+               }
+       }
 }
 
 ?>