* Respect read-only mode on block removals
[lhc/web/wiklou.git] / includes / Article.php
index ce6e1b0..62f3129 100644 (file)
 <?php
-# $Id$
-#
-# Class representing a Wikipedia article and history.
-# See design.doc for an overview.
-
-# Note: edit user interface and cache support functions have been
-# moved to separate EditPage and CacheManager classes.
-
+/**
+ * File for articles
+ * @package MediaWiki
+ */
+
+/**
+ * Need the CacheManager to be loaded
+ */
 require_once( 'CacheManager.php' );
-
+require_once( 'Revision.php' );
+
+$wgArticleCurContentFields = false;
+$wgArticleOldContentFields = false;
+
+/**
+ * Class representing a Wikipedia article and history.
+ *
+ * See design.doc for an overview.
+ * Note: edit user interface and cache support functions have been
+ * moved to separate EditPage and CacheManager classes.
+ *
+ * @package MediaWiki
+ */
 class Article {
-       /* private */ var $mContent, $mContentLoaded;
-       /* private */ var $mUser, $mTimestamp, $mUserText;
-       /* private */ var $mCounter, $mComment, $mCountAdjustment;
-       /* private */ var $mMinorEdit, $mRedirectedFrom;
-       /* private */ var $mTouched, $mFileCache, $mTitle;
-       /* private */ var $mId, $mTable;
-
+       /**#@+
+        * @access private
+        */
+       var $mContent, $mContentLoaded;
+       var $mUser, $mTimestamp, $mUserText;
+       var $mCounter, $mComment, $mCountAdjustment;
+       var $mMinorEdit, $mRedirectedFrom;
+       var $mTouched, $mFileCache, $mTitle;
+       var $mId, $mTable;
+       var $mForUpdate;
+       var $mOldId;
+       /**#@-*/
+
+       /**
+        * Constructor and clear the article
+        * @param mixed &$title
+        */
        function Article( &$title ) {
                $this->mTitle =& $title;
                $this->clear();
        }
 
-       /* private */ function clear()
-       {
+       /**
+        * get the title object of the article
+        * @public
+        */
+       function getTitle() {
+               return $this->mTitle;   
+       }
+
+       /**
+         * Clear the object
+         * @private
+         */
+       function clear() {
                $this->mContentLoaded = false;
                $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';
+               $this->mForUpdate = false;
        }
 
-       # Get revision text associated with an old or archive row
-       # $row is usually an object from wfFetchRow(), both the flags and the text field must be included
-       /* static */ function getRevisionText( $row, $prefix = 'old_' ) {
-               # Get data
-               $textField = $prefix . 'text';
-               $flagsField = $prefix . 'flags';
-
-               if ( isset( $row->$flagsField ) ) {
-                       $flags = explode( ",", $row->$flagsField );
-               } else {
-                       $flags = array();
-               }
-
-               if ( isset( $row->$textField ) ) {
-                       $text = $row->$textField;
-               } else {
-                       return false;
-               }
-
-               if ( in_array( 'link', $flags ) ) {
-                       # Handle link type
-                       $text = Article::followLink( $text );
-               } elseif ( in_array( 'gzip', $flags ) ) {
-                       # 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.
-                       return gzinflate( $text );
-               }
-               return $text;
-       }
-
-       /* 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';
-       }
-
-       # Returns the text associated with a "link" type old table row
-       /* static */ function followLink( $link ) {
-               # Split the link into fields and values
-               $lines = explode( '\n', $link );
-               $hash = '';
-               $locations = array();
-               foreach ( $lines as $line ) {
-                       # Comments
-                       if ( $line{0} == '#' ) {
-                               continue;
-                       }
-                       # Field/value pairs
-                       if ( preg_match( '/^(.*?)\s*:\s*(.*)$/', $line, $matches ) ) {
-                               $field = strtolower($matches[1]);
-                               $value = $matches[2];
-                               if ( $field == 'hash' ) {
-                                       $hash = $value;
-                               } elseif ( $field == 'location' ) {
-                                       $locations[] = $value;
-                               }
-                       }
-               }
-
-               if ( $hash === '' ) {
-                       return false;
-               }
-
-               # Look in each specified location for the text
-               $text = false;
-               foreach ( $locations as $location ) {
-                       $text = Article::fetchFromLocation( $location, $hash );
-                       if ( $text !== false ) {
-                               break;
-                       }
-               }
-
-               return $text;
-       }
-
-       /* static */ function fetchFromLocation( $location, $hash ) {
-               global $wgLoadBalancer;
-               $fname = 'fetchFromLocation';
-               wfProfileIn( $fname );
-
-               $p = strpos( $location, ':' );
-               if ( $p === false ) {
-                       wfProfileOut( $fname );
-                       return false;
-               }
-
-               $type = substr( $location, 0, $p );
-               $text = false;
-               switch ( $type ) {
-                       case 'mysql':
-                               # MySQL locations are specified by mysql://<machineID>/<dbname>/<tblname>/<index>
-                               # Machine ID 0 is the current connection
-                               if ( preg_match( '/^mysql:\/\/(\d+)\/([A-Za-z_]+)\/([A-Za-z_]+)\/([A-Za-z_]+)$/',
-                                 $location, $matches ) ) {
-                                       $machineID = $matches[1];
-                                       $dbName = $matches[2];
-                                       $tblName = $matches[3];
-                                       $index = $matches[4];
-                                       if ( $machineID == 0 ) {
-                                               # Current connection
-                                               $db =& wfGetDB();
-                                       } else {
-                                               # Alternate connection
-                                               $db =& $wgLoadBalancer->getConnection( $machineID );
-
-                                               if ( array_key_exists( $machineId, $wgKnownMysqlServers ) ) {
-                                                       # Try to open, return false on failure
-                                                       $params = $wgKnownDBServers[$machineId];
-                                                       $db = Database::newFromParams( $params['server'], $params['user'], $params['password'],
-                                                               $dbName, 1, false, true, true );
-                                               }
-                                       }
-                                       if ( $db->isOpen() ) {
-                                               $index = wfStrencode( $index );
-                                               $res = $db->query( "SELECT blob_data FROM $dbName.$tblName WHERE blob_index='$index'", $fname );
-                                               $row = $db->fetchObject( $res );
-                                               $text = $row->text_data;
-                                       }
-                               }
-                               break;
-                       case 'file':
-                               # File locations are of the form file://<filename>, relative to the current directory
-                               if ( preg_match( '/^file:\/\/(.*)$', $location, $matches ) )
-                               $filename = strstr( $location, 'file://' );
-                               $text = @file_get_contents( $matches[1] );
-               }
-               if ( $text !== false ) {
-                       # Got text, now we need to interpret it
-                       # The first line contains information about how to do this
-                       $p = strpos( $text, '\n' );
-                       $type = substr( $text, 0, $p );
-                       $text = substr( $text, $p + 1 );
-                       switch ( $type ) {
-                               case 'plain':
-                                       break;
-                               case 'gzip':
-                                       $text = gzinflate( $text );
-                                       break;
-                               case 'object':
-                                       $object = unserialize( $text );
-                                       $text = $object->getItem( $hash );
-                                       break;
-                               default:
-                                       $text = false;
-                       }
-               }
-               wfProfileOut( $fname );
-               return $text;
-       }
-
-       # Note that getContent/loadContent may follow redirects if
-       # not told otherwise, and so may cause a change to mTitle.
-
-       # Return the text of this revision
-       function getContent( $noredir )
-       {
+       /**
+        * Note that getContent/loadContent may follow redirects if
+        * not told otherwise, and so may cause a change to mTitle.
+        *
+        * @param $noredir
+        * @return Return the text of this revision
+       */
+       function getContent( $noredir ) {
                global $wgRequest;
 
                # Get variables from query string :P
@@ -214,17 +93,14 @@ class Article {
                        return wfMsg( 'noarticletext' );
                } else {
                        $this->loadContent( $noredir );
-
-                       if(
-                               # check if we're displaying a [[User talk:x.x.x.x]] anonymous talk page
-                               ( $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'
-                               )
-                               {
+                       # check if we're displaying a [[User talk:x.x.x.x]] anonymous talk page
+                       if ( $this->mTitle->getNamespace() == NS_USER_TALK &&
+                         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 {
+                               return $this->mContent . "\n" .wfMsg('anontalkpagetext');
+                       else {
                                if($action=='edit') {
                                        if($section!='') {
                                                if($section=='new') {
@@ -245,13 +121,18 @@ class Article {
                }
        }
 
-       # This function returns the text of a section, specified by a number ($section).
-       # A section is text under a heading like == Heading == or <h1>Heading</h1>, or
-       # the first section before any such heading (section 0).
-       #
-       # If a section contains subsections, these are also returned.
-       #
-       function getSection($text,$section)  {
+       /**
+        * This function returns the text of a section, specified by a number ($section).
+        * A section is text under a heading like == Heading == or <h1>Heading</h1>, or
+        * the first section before any such heading (section 0).
+        *
+        * If a section contains subsections, these are also returned.
+        *
+        * @param string $text text to look in
+        * @param integer $section section number
+        * @return string text of the requested section
+        */
+       function getSection($text,$section) {
 
                # strip NOWIKI etc. to avoid confusion (true-parameter causes HTML
                # comments to be stripped as well)
@@ -264,14 +145,14 @@ class Article {
                # split it up by section
                $secs =
                  preg_split(
-                 '/(^=+.*?=+|^<h[1-6].*?' . '>.*?<\/h[1-6].*?' . '>)/mi',
+                 '/(^=+.+?=+|^<h[1-6].*?' . '>.*?<\/h[1-6].*?' . '>)(?!\S)/mi',
                  $striptext, -1,
                  PREG_SPLIT_DELIM_CAPTURE);
                if($section==0) {
                        $rv=$secs[0];
                } else {
                        $headline=$secs[$section*2-1];
-                       preg_match( '/^(=+).*?=+|^<h([1-6]).*?' . '>.*?<\/h[1-6].*?' . '>/mi',$headline,$matches);
+                       preg_match( '/^(=+).+?=+|^<h([1-6]).*?' . '>.*?<\/h[1-6].*?' . '>(?!\S)/mi',$headline,$matches);
                        $hlevel=$matches[1];
 
                        # translate wiki heading into level
@@ -286,7 +167,7 @@ class Article {
                        while(!empty($secs[$count*2-1]) && !$break) {
 
                                $subheadline=$secs[$count*2-1];
-                               preg_match( '/^(=+).*?=+|^<h([1-6]).*?' . '>.*?<\/h[1-6].*?' . '>/mi',$subheadline,$matches);
+                               preg_match( '/^(=+).+?=+|^<h([1-6]).*?' . '>.*?<\/h[1-6].*?' . '>(?!\S)/mi',$subheadline,$matches);
                                $subhlevel=$matches[1];
                                if(strpos($subhlevel,'=')!==false) {
                                        $subhlevel=strlen($subhlevel);
@@ -309,200 +190,234 @@ class Article {
 
        }
 
+       /**
+        * Return an array of the columns of the "cur"-table
+        */
+       function getContentFields() {
+               return $wgArticleContentFields = array(
+                 'old_text','old_flags',
+                 'rev_timestamp','rev_user', 'rev_user_text', 'rev_comment','page_counter',
+                 'page_namespace', 'page_title', 'page_restrictions','page_touched','page_is_redirect' );
+       }
 
-       # Load the revision (including cur_text) into this object
-       function loadContent( $noredir = false )
-       {
-               global $wgOut, $wgMwRedir, $wgRequest, $wgIsPg;
-
+       /**
+        * Return the oldid of the article that is to be shown.
+        * For requests with a "direction", this is not the oldid of the
+        * query
+        */
+       function getOldID() {
+               global $wgRequest, $wgOut;
+               static $lastid;
+               
+               if ( isset( $lastid ) ) {
+                       return $lastid;
+               }
                # Query variables :P
                $oldid = $wgRequest->getVal( 'oldid' );
-               $redirect = $wgRequest->getVal( 'redirect' );
+               if ( isset( $oldid ) ) {
+                       $oldid = IntVal( $oldid );
+                       if ( $wgRequest->getVal( 'direction' ) == 'next' ) {
+                               $nextid = $this->mTitle->getNextRevisionID( $oldid );
+                               if ( $nextid  ) {
+                                       $oldid = $nextid;
+                               } else {
+                                       $wgOut->redirect( $this->mTitle->getFullURL( 'redirect=no' ) );
+                               }
+                       } elseif ( $wgRequest->getVal( 'direction' ) == 'prev' ) {
+                               $previd = $this->mTitle->getPreviousRevisionID( $oldid );
+                               if ( $previd ) {
+                                       $oldid = $previd;
+                               } else {
+                                       # TODO
+                               }
+                       }
+                       $lastid = $oldid;
+               }
+               return @$oldid; # "@" to be able to return "unset" without PHP complaining
+       }
+
+
+       /**
+        * Load the revision (including cur_text) into this object
+        */
+       function loadContent( $noredir = false ) {
+               global $wgOut, $wgRequest;
 
                if ( $this->mContentLoaded ) return;
+               
+               # Query variables :P
+               $oldid = $this->getOldID();
+               $redirect = $wgRequest->getVal( 'redirect' );
+
                $fname = 'Article::loadContent';
 
                # Pre-fill content with error message so that if something
                # fails we'll have something telling us what we intended.
 
                $t = $this->mTitle->getPrefixedText();
-               if ( isset( $oldid ) ) {
-                       $oldid = IntVal( $oldid );
-                       $t .= ",oldid={$oldid}";
+
+               $noredir = $noredir || ($wgRequest->getVal( 'redirect' ) == 'no');
+               $this->mOldId = $oldid;
+               $this->fetchContent( $oldid, $noredir, true );
+       }
+       
+       /**
+        * Get text of an article from database
+        * @param int $oldid 0 for whatever the latest revision is
+        * @param bool $noredir Set to true to avoid following redirects
+        * @param bool $globalTitle Set to true to change the global $wgTitle object when following redirects or other unexpected title changes
+        * @return string
+        */
+       function fetchContent( $oldid = 0, $noredir = false, $globalTitle = false ) {
+               if ( $this->mContentLoaded ) {
+                       return $this->mContent;
                }
-               if ( isset( $redirect ) ) {
+               $dbr =& $this->getDB();
+               $fname = 'Article::fetchContent';
+
+               # 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( $oldid ) {
+                       $t .= ',oldid='.$oldid;
+               }
+               if( isset( $redirect ) ) {
                        $redirect = ($redirect == 'no') ? 'no' : 'yes';
-                       $t .= ",redirect={$redirect}";
+                       $t .= ',redirect='.$redirect;
                }
                $this->mContent = wfMsg( 'missingarticle', $t );
 
-               if ( ! $oldid ) {       # Retrieve current version
+               if( !$oldid ) {
+                       # Retrieve current version
                        $id = $this->getID();
-                       if ( 0 == $id ) return;
-
-                       $sql = 'SELECT ' .
-                         'cur_text,cur_timestamp,cur_user,cur_user_text,cur_comment,cur_counter,cur_restrictions,cur_touched ' .
-                         "FROM cur WHERE cur_id={$id}";
-                       wfDebug( "$sql\n" );
-                       $res = wfQuery( $sql, DB_READ, $fname );
-                       if ( 0 == wfNumRows( $res ) ) {
-                               return;
+                       if ( 0 == $id ) {
+                               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 ( ( 'no' != $redirect ) && ( false == $noredir ) &&
-                         ( $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_user_text,cur_comment,' .
-                                                         "cur_counter,cur_restrictions,cur_touched FROM cur WHERE cur_id={$rid}";
-                                                       $res = wfQuery( $sql, DB_READ, $fname );
-
-                                                       if ( 0 != wfNumRows( $res ) ) {
-                                                               $this->mRedirectedFrom = $this->mTitle->getPrefixedText();
-                                                               $this->mTitle = $rt;
-                                                               $s = wfFetchObject( $res );
-                                                       }
-                                               }
+                       $s = $dbr->selectRow( array( 'text', 'revision', 'page' ),
+                               $this->getContentFields(),
+                               "page_id='$id' AND rev_page=page_id AND rev_id=page_latest AND old_id=rev_id",
+                               $fname, $this->getSelectOptions() );
+               } else {
+                       # Historical revision
+                       $s = $dbr->selectRow( array( 'text', 'revision', 'page' ),
+                               $this->getContentFields(),
+                               "rev_page=page_id AND rev_id='$oldid' AND old_id=rev_id",
+                               $fname, $this->getSelectOptions() );
+               }
+               if ( $s === false ) {
+                       return false;
+               }
+
+               # If we got a redirect, follow it (unless we've been told
+               # not to by either the function parameter or the query
+               if ( !$oldid && !$noredir ) {
+                       $rt = Title::newFromRedirect( Revision::getRevisionText( $s ) );
+                       # process if title object is valid and not special:userlogout
+                       if ( $rt && ! ( $rt->getNamespace() == NS_SPECIAL && $rt->getText() == 'Userlogout' ) ) {
+                               # Gotta hand redirects to special pages differently:
+                               # Fill the HTTP response "Location" header and ignore
+                               # the rest of the page we're on.
+                               if( $globalTitle ) {
+                                       global $wgOut;
+                                       if ( $rt->getInterwiki() != '' && $rt->isLocal() ) {
+                                               $wgOut->redirect( $rt->getFullURL() ) ;
+                                               return false;
+                                       }
+                                       if ( $rt->getNamespace() == NS_SPECIAL ) {
+                                               $wgOut->redirect( $rt->getFullURL() );
+                                               return false;
+                                       }
+                               }
+                               $rid = $rt->getArticleID();
+                               if ( 0 != $rid ) {
+                                       $redirRow = $dbr->selectRow( array( 'text', 'revision', 'page' ),
+                                               $this->getContentFields(),
+                                               "page_id='$rid' AND rev_page=page_id AND rev_id=page_latest AND old_id=rev_id",
+                                               $fname, $this->getSelectOptions() );
+
+                                       if ( $redirRow !== false ) {
+                                               $this->mRedirectedFrom = $this->mTitle->getPrefixedText();
+                                               $this->mTitle = $rt;
+                                               $s = $redirRow;
                                        }
                                }
                        }
-
-                       $this->mContent = $s->cur_text;
-                       $this->mUser = $s->cur_user;
-                       $this->mUserText = $s->cur_user_text;
-                       $this->mComment = $s->cur_comment;
-                       $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
-                       $oldtable=$wgIsPg?'"old"':'old';
-                       $sql = "SELECT old_namespace,old_title,old_text,old_timestamp,".
-                               "old_user,old_user_text,old_comment,old_flags FROM old ".
-                               "WHERE old_id={$oldid}";
-                       $res = wfQuery( $sql, DB_READ, $fname );
-                       if ( 0 == wfNumRows( $res ) ) {
-                               return;
-                       }
-
-                       $s = wfFetchObject( $res );
-                       if( $this->mTitle->getNamespace() != $s->old_namespace ||
-                               $this->mTitle->getDBkey() != $s->old_title ) {
-                               $oldTitle = Title::makeTitle( $s->old_namesapce, $s->old_title );
-                               $this->mTitle = $oldTitle;
-                               $wgTitle = $oldTitle;
-                       }
-                       $this->mContent = Article::getRevisionText( $s );
-                       $this->mUser = $s->old_user;
-                       $this->mUserText = $s->old_user_text;
-                       $this->mComment = $s->old_comment;
-                       $this->mCounter = 0;
-                       $this->mTimestamp = $s->old_timestamp;
-                       wfFreeResult( $res );
                }
+
+               # if the title's different from expected, update...
+               if( $globalTitle &&
+                       ( $this->mTitle->getNamespace() != $s->page_namespace ||
+                       $this->mTitle->getDBkey() != $s->page_title ) ) {
+                       $oldTitle = Title::makeTitle( $s->page_namesapce, $s->page_title );
+                       $this->mTitle = $oldTitle;
+                       global $wgTitle;
+                       $wgTitle = $oldTitle;
+               }
+               
+               # Back to the business at hand...
+               $this->mCounter = $s->page_counter;
+               $this->mTitle->mRestrictions = explode( ',', trim( $s->page_restrictions ) );
+               $this->mTitle->mRestrictionsLoaded = true;
+               $this->mTouched = wfTimestamp( TS_MW, $s->page_touched );
+
+               $this->mContent = Revision::getRevisionText( $s );
+               
+               $this->mUser = $s->rev_user;
+               $this->mUserText = $s->rev_user_text;
+               $this->mComment = $s->rev_comment;
+               $this->mTimestamp = wfTimestamp( TS_MW, $s->rev_timestamp );
+               
                $this->mContentLoaded = true;
                return $this->mContent;
        }
 
-       # Gets the article text without using so many damn globals
-       # Returns false on error
+       /**
+        * Gets the article text without using so many damn globals
+        * Returns false on error
+        *
+        * @param integer $oldid
+        */
        function getContentWithoutUsingSoManyDamnGlobals( $oldid = 0, $noredir = false ) {
-               global $wgMwRedir, $wgIsPg;
-
-               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;
-                       }
+               return $this->fetchContent( $oldid, $noredir, 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;
-                       }
+       /**
+        * Read/write accessor to select FOR UPDATE
+        */
+       function forUpdate( $x = NULL ) {
+               return wfSetVar( $this->mForUpdate, $x );
+       }
 
-                       $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 );
-                                                       }
-                                               }
-                                       }
-                               }
-                       }
+       /**
+        * Get the database which should be used for reads
+        */
+       function &getDB() {
+               if ( $this->mForUpdate ) {
+                       return wfGetDB( DB_MASTER );
+               } else {
+                       return wfGetDB( DB_SLAVE );
+               }
+       }
 
-                       $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
-                       $oldtable=$wgIsPg?'"old"':'old';
-                       $sql = "SELECT old_text,old_timestamp,old_user,old_flags FROM $oldtable " .
-                         "WHERE old_id={$oldid}";
-                       $res = wfQuery( $sql, DB_READ, $fname );
-                       if ( 0 == wfNumRows( $res ) ) {
-                               return false;
+       /**
+        * Get options for all SELECT statements
+        * Can pass an option array, to which the class-wide options will be appended
+        */
+       function getSelectOptions( $options = '' ) {
+               if ( $this->mForUpdate ) {
+                       if ( is_array( $options ) ) {
+                               $options[] = 'FOR UPDATE';
+                       } else {
+                               $options = 'FOR UPDATE';
                        }
-
-                       $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;
+               return $options;
        }
 
+       /**
+        * Return the Article ID
+        */
        function getID() {
                if( $this->mTitle ) {
                        return $this->mTitle->getArticleID();
@@ -511,156 +426,185 @@ class Article {
                }
        }
 
-       function getCount()
-       {
+       /**
+        * Get the view count for this article
+        */
+       function getCount() {
                if ( -1 == $this->mCounter ) {
                        $id = $this->getID();
-                       $this->mCounter = wfGetSQL( 'cur', 'cur_counter', "cur_id={$id}" );
+                       $dbr =& $this->getDB();
+                       $this->mCounter = $dbr->selectField( 'page', 'page_counter', array( 'page_id' => $id ),
+                               'Article::getCount', $this->getSelectOptions() );
                }
                return $this->mCounter;
        }
 
-       # Would the given text make this article a "good" article (i.e.,
-       # suitable for including in the article count)?
-
-       function isCountable( $text )
-       {
-               global $wgUseCommaCount, $wgMwRedir;
-
-               if ( 0 != $this->mTitle->getNamespace() ) { return 0; }
-               if ( $wgMwRedir->matchStart( $text ) ) { return 0; }
+       /**
+        * Would the given text make this article a "good" article (i.e.,
+        * suitable for including in the article count)?
+        * @param string $text Text to analyze
+        * @return integer 1 if it can be counted else 0
+        */
+       function isCountable( $text ) {
+               global $wgUseCommaCount;
+
+               if ( NS_MAIN != $this->mTitle->getNamespace() ) { return 0; }
+               if ( $this->isRedirect( $text ) ) { return 0; }
                $token = ($wgUseCommaCount ? ',' : '[[' );
                if ( false === strstr( $text, $token ) ) { return 0; }
                return 1;
        }
 
-       # Loads everything from cur except cur_text
-       # This isn't necessary for all uses, so it's only done if needed.
+       /** 
+        * Tests if the article text represents a redirect
+        */
+       function isRedirect( $text = false ) {
+               if ( $text === false ) {
+                       $this->loadContent();
+                       $titleObj = Title::newFromRedirect( $this->mText );
+               } else {
+                       $titleObj = Title::newFromRedirect( $text );
+               }
+               return $titleObj !== NULL;
+       }
 
-       /* private */ function loadLastEdit()
-       {
+       /**
+        * Loads everything except the text
+        * This isn't necessary for all uses, so it's only done if needed.
+        * @private
+        */
+       function loadLastEdit() {
                global $wgOut;
-               if ( -1 != $this->mUser ) return;
 
-               $sql = 'SELECT cur_user,cur_user_text,cur_timestamp,' .
-                 'cur_comment,cur_minor_edit FROM cur WHERE ' .
-                 'cur_id=' . $this->getID();
-               $res = wfQuery( $sql, DB_READ, 'Article::loadLastEdit' );
+               if ( -1 != $this->mUser )
+                       return;
+
+               # New or non-existent articles have no user information
+               $id = $this->getID();
+               if ( 0 == $id ) return;
 
-               if ( wfNumRows( $res ) > 0 ) {
-                       $s = wfFetchObject( $res );
-                       $this->mUser = $s->cur_user;
-                       $this->mUserText = $s->cur_user_text;
-                       $this->mTimestamp = $s->cur_timestamp;
-                       $this->mComment = $s->cur_comment;
-                       $this->mMinorEdit = $s->cur_minor_edit;
+               $fname = 'Article::loadLastEdit';
+
+               $dbr =& $this->getDB();
+               $s = $dbr->selectRow( array( 'revision', 'page') ,
+                 array( 'rev_user','rev_user_text','rev_timestamp', 'rev_comment','rev_minor_edit' ),
+                 array( 'page_id' => $id, 'page_latest=rev_id' ), $fname, $this->getSelectOptions() );
+
+               if ( $s !== false ) {
+                       $this->mUser = $s->rev_user;
+                       $this->mUserText = $s->rev_user_text;
+                       $this->mTimestamp = wfTimestamp(TS_MW,$s->rev_timestamp);
+                       $this->mComment = $s->rev_comment;
+                       $this->mMinorEdit = $s->rev_minor_edit;
                }
        }
 
-       function getTimestamp()
-       {
+       function getTimestamp() {
                $this->loadLastEdit();
                return $this->mTimestamp;
        }
 
-       function getUser()
-       {
+       function getUser() {
                $this->loadLastEdit();
                return $this->mUser;
        }
 
-       function getUserText()
-       {
+       function getUserText() {
                $this->loadLastEdit();
                return $this->mUserText;
        }
 
-       function getComment()
-       {
+       function getComment() {
                $this->loadLastEdit();
                return $this->mComment;
        }
 
-       function getMinorEdit()
-       {
+       function getMinorEdit() {
                $this->loadLastEdit();
                return $this->mMinorEdit;
        }
 
-        function getContributors($limit = 0, $offset = 0)
-        {
-                $fname = 'Article::getContributors';
-
-               # XXX: this is expensive; cache this info somewhere.
+       function getContributors($limit = 0, $offset = 0) {
+               $fname = 'Article::getContributors';
 
-               $title = $this->mTitle;
+               # XXX: this is expensive; cache this info somewhere.
 
-               $contribs = array();
+               $title = $this->mTitle;
+               $contribs = array();
+               $dbr =& $this->getDB();
+               $revTable = $dbr->tableName( 'revision' );
+               $userTable = $dbr->tableName( 'user' );
+               $encDBkey = $dbr->addQuotes( $title->getDBkey() );
+               $ns = $title->getNamespace();
+               $user = $this->getUser();
+               $pageId = $this->getId();
 
-                $sql = 'SELECT old_user, old_user_text, ' .
-                       '  user_real_name, MAX(old_timestamp) as timestamp' .
-                       ' FROM old LEFT JOIN user ON old.old_user = user.user_id ' .
-                      ' WHERE old.old_namespace = ' . $title->getNamespace() .
-                       ' AND old.old_title = "' . $title->getDBkey() . '"' .
-                       ' AND old.old_user != ' . $this->getUser() .
-                       ' GROUP BY old.old_user ' .
-                       ' ORDER BY timestamp DESC ';
+               $sql = "SELECT rev_user, rev_user_text, user_real_name, MAX(rev_timestamp) as timestamp
+                       FROM $revTable LEFT JOIN $userTable ON rev_user = user_id
+                       WHERE rev_page = $pageId
+                       AND rev_user != $user
+                       GROUP BY rev_user, rev_user_text, user_real_name
+                       ORDER BY timestamp DESC";
 
-                if ($limit > 0) {
-                        $sql .= ' LIMIT '.$limit;
-                }
+               if ($limit > 0) { $sql .= ' LIMIT '.$limit; }
+               $sql .= ' '. $this->getSelectOptions();
 
-               $res = wfQuery($sql, DB_READ, $fname);
+               $res = $dbr->query($sql, $fname);
 
-               while ( $line = wfFetchObject( $res ) ) {
-                       $contribs[] = array($line->old_user, $line->old_user_text, $line->user_real_name);
-               }
-
-               wfFreeResult($res);
+               while ( $line = $dbr->fetchObject( $res ) ) {
+                       $contribs[] = array($line->rev_user, $line->rev_user_text, $line->user_real_name);
+               }
 
-               return $contribs;
+               $dbr->freeResult($res);
+               return $contribs;
        }
 
-       # This is the default action of the script: just view the page of
-       # the given title.
-
-       function view()
-       {
-               global $wgUser, $wgOut, $wgLang, $wgRequest;
-               global $wgLinkCache, $IP, $wgEnableParserCache;
+       /**
+        * This is the default action of the script: just view the page of
+        * the given title.
+       */
+       function view() {
+               global $wgUser, $wgOut, $wgRequest, $wgOnlySysopsCanPatrol, $wgLang;
+               global $wgLinkCache, $IP, $wgEnableParserCache, $wgStylePath, $wgUseRCPatrol;
+               global $wgEnotif;
+               $sk = $wgUser->getSkin();
 
                $fname = 'Article::view';
                wfProfileIn( $fname );
-
-               # Get variables from query string :P
-               $oldid = $wgRequest->getVal( 'oldid' );
+               # Get variables from query string
+               $oldid = $this->getOldID();
                $diff = $wgRequest->getVal( 'diff' );
+               $rcid = $wgRequest->getVal( 'rcid' );
 
                $wgOut->setArticleFlag( true );
                $wgOut->setRobotpolicy( 'index,follow' );
-
                # If we got diff and oldid in the query, we want to see a
                # diff page instead of the article.
 
                if ( !is_null( $diff ) ) {
+                       require_once( 'DifferenceEngine.php' );
                        $wgOut->setPageTitle( $this->mTitle->getPrefixedText() );
-                       $de = new DifferenceEngine( intval($oldid), intval($diff) );
+                       $de = new DifferenceEngine( $oldid, $diff, $rcid );
                        $de->showDiffPage();
+                       if( $diff == 0 ) {
+                               # Run view updates for current revision only
+                               $this->viewUpdates();
+                       }
                        wfProfileOut( $fname );
                        return;
                }
-
-               if ( !is_null( $oldid ) and $this->checkTouched() ) {
+               if ( empty( $oldid ) && $this->checkTouched() ) {
                        if( $wgOut->checkLastModified( $this->mTouched ) ){
+                               wfProfileOut( $fname );
                                return;
                        } else if ( $this->tryFileCache() ) {
                                # tell wgOut that output is taken care of
                                $wgOut->disable();
                                $this->viewUpdates();
+                               wfProfileOut( $fname );
                                return;
                        }
                }
-
                # Should the parser cache be used?
                if ( $wgEnableParserCache && intval($wgUser->getOption( 'stubthreshold' )) == 0 && empty( $oldid ) ) {
                        $pcache = true;
@@ -674,7 +618,6 @@ class Article {
                                $outputDone = true;
                        }
                }
-
                if ( !$outputDone ) {
                        $text = $this->getContent( false ); # May change mTitle by following a redirect
 
@@ -689,7 +632,7 @@ class Article {
                        # We're looking at an old revision
 
                        if ( !empty( $oldid ) ) {
-                               $this->setOldSubtitle();
+                               $this->setOldSubtitle( isset($this->mOldId) ? $this->mOldId : $oldid );
                                $wgOut->setRobotpolicy( 'noindex,follow' );
                        }
                        if ( '' != $this->mRedirectedFrom ) {
@@ -703,40 +646,66 @@ class Article {
                                $pcache = false;
                        }
 
-                       $wgLinkCache->preFill( $this->mTitle );
-
                        # wrap user css and user js in pre and don't parse
                        # XXX: use $this->mTitle->usCssJsSubpage() when php is fixed/ a workaround is found
                        if (
-                               $this->mTitle->getNamespace() == Namespace::getUser() &&
+                               $this->mTitle->getNamespace() == NS_USER &&
                                preg_match('/\\/[\\w]+\\.(css|js)$/', $this->mTitle->getDBkey())
                        ) {
                                $wgOut->addWikiText( wfMsg('clearyourcache'));
                                $wgOut->addHTML( '<pre>'.htmlspecialchars($this->mContent)."\n</pre>" );
+                       } else if ( $rt = Title::newFromRedirect( $text ) ) {
+                               # Display redirect
+                               $imageUrl = $wgStylePath.'/common/images/redirect.png';
+                               $targetUrl = $rt->escapeLocalURL();
+                               $titleText = htmlspecialchars( $rt->getPrefixedText() );
+                               $link = $sk->makeLinkObj( $rt );
+
+                               $wgOut->addHTML( '<img valign="center" src="'.$imageUrl.'" alt="#REDIRECT" />' .
+                                 '<span class="redirectText">'.$link.'</span>' );
+
                        } else if ( $pcache ) {
-                               $wgOut->addWikiText( $text, true, $this );
+                               # Display content and save to parser cache
+                               $wgOut->addPrimaryWikiText( $text, $this );
                        } else {
+                               # Display content, don't attempt to save to parser cache
                                $wgOut->addWikiText( $text );
                        }
                }
                $wgOut->setPageTitle( $this->mTitle->getPrefixedText() );
+               # If we have been passed an &rcid= parameter, we want to give the user a
+               # chance to mark this new article as patrolled.
+               if ( $wgUseRCPatrol && !is_null ( $rcid ) && $rcid != 0 && $wgUser->isLoggedIn() &&
+                    ( $wgUser->isAllowed('patrol') || !$wgOnlySysopsCanPatrol ) )
+               {
+                       $wgOut->addHTML( wfMsg ( 'markaspatrolledlink',
+                               $sk->makeKnownLinkObj ( $this->mTitle, wfMsg ( 'markaspatrolledtext' ),
+                                       'action=markpatrolled&rcid='.$rcid )
+                        ) );
+               }
+
+               # Put link titles into the link cache
+               $wgOut->transformBuffer();
 
                # Add link titles as META keywords
                $wgOut->addMetaTags() ;
 
                $this->viewUpdates();
                wfProfileOut( $fname );
-       }
 
-       # Theoretically we could defer these whole insert and update
-       # functions for after display, but that's taking a big leap
-       # of faith, and we want to be able to report database
-       # errors at some point.
+               $wgUser->clearNotification( $this->mTitle );
+       }
 
-       /* private */ function insertNewArticle( $text, $summary, $isminor, $watchthis )
-       {
-               global $wgOut, $wgUser, $wgLinkCache, $wgMwRedir;
-               global $wgUseSquid, $wgDeferredUpdateList, $wgInternalServer, $wgIsPg, $wgIsMySQL;
+       /**
+        * Theoretically we could defer these whole insert and update
+        * functions for after display, but that's taking a big leap
+        * of faith, and we want to be able to report database
+        * errors at some point.
+        * @private
+        */
+       function insertNewArticle( $text, $summary, $isminor, $watchthis ) {
+               global $wgOut, $wgUser;
+               global $wgUseSquid, $wgDeferredUpdateList, $wgInternalServer;
 
                $fname = 'Article::insertNewArticle';
 
@@ -745,37 +714,52 @@ class Article {
                $ns = $this->mTitle->getNamespace();
                $ttl = $this->mTitle->getDBkey();
                $text = $this->preSaveTransform( $text );
-               if ( $wgMwRedir->matchStart( $text ) ) { $redir = 1; }
+               if ( $this->isRedirect( $text ) ) { $redir = 1; }
                else { $redir = 0; }
 
                $now = wfTimestampNow();
-               $won = wfInvertTimestamp( $now );
                wfSeedRandom();
-               $rand = number_format( mt_rand() / mt_getrandmax(), 12, '.', '' );
+               $rand = wfRandom();
+               $isminor = ( $isminor && $wgUser->isLoggedIn() ) ? 1 : 0;
+               
+               $mungedText = $text;
+               $flags = Revision::compressRevisionText( $mungedText );
+
+               $dbw =& wfGetDB( DB_MASTER );
+
+               $old_id = $dbw->nextSequenceValue( 'text_old_id_seq' );
+               $dbw->insert( 'text', array(
+                       'old_id' => $old_id,
+                       'old_text' => $mungedText,
+                       'old_flags' => $flags,
+               ), $fname );
+               $revisionId = $dbw->insertId();
+               
+               $page_id = $dbw->nextSequenceValue( 'page_page_id_seq' );
+               $dbw->insert( 'page', array(
+                       'page_id' => $page_id,
+                       'page_namespace' => $ns,
+                       'page_title' => $ttl,
+                       'page_counter' => 0,
+                       'page_restrictions' => '',
+                       'page_is_redirect' => $redir,
+                       'page_is_new' => 1,
+                       'page_random' => $rand,
+                       'page_touched' => $dbw->timestamp($now),
+                       'page_latest' => $revisionId,
+               ), $fname );
+               $newid = $dbw->insertId();
+
+               $dbw->insert( 'revision', array(
+                       'rev_page' => $newid,
+                       'rev_id' => $revisionId,
+                       'rev_comment' => $summary,
+                       'rev_user' => $wgUser->getID(),
+                       'rev_timestamp' => $dbw->timestamp($now),
+                       'rev_minor_edit' => $isminor,
+                       'rev_user_text' => $wgUser->getName(),
+               ), $fname );
 
-               if ($wgIsPg) {
-                       $cur_id_column="cur_id,";
-                       $cur_id=wfGetSQL(""," nextval('cur_cur_id_seq')");
-                       $cur_id_value="{$cur_id},";
-               } else {
-                       $cur_id_column="";
-                       $cur_id="";
-                       $cur_id_value="";
-               }
-
-               $isminor = ( $isminor && $wgUser->getID() ) ? 1 : 0;
-               $sql = "INSERT INTO cur ({$cur_id_column}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,' .
-                 "cur_is_new,cur_random,cur_touched,inverse_timestamp) VALUES ({$cur_id_value}{$ns},'" . wfStrencode( $ttl ) . "', '" .
-                 wfStrencode( $text ) . "', '" .
-                 wfStrencode( $summary ) . "', '" .
-                 $wgUser->getID() . "', '{$now}', " .
-                 $isminor . ", 0, '', '" .
-                 wfStrencode( $wgUser->getName() ) . "', $redir, 1, $rand, '{$now}', '{$won}')";
-               $res = wfQuery( $sql, DB_WRITE, $fname );
-
-               $newid = $wgIsPg?$cur_id:wfInsertId();
                $this->mTitle->resetArticleID( $newid );
 
                Article::onArticleCreate( $this->mTitle );
@@ -791,20 +775,56 @@ class Article {
 
                # 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 );
+               $dbw->update( 'page',
+                       array( 'page_touched' => $dbw->timestamp($now) ),
+                       array( 'page_namespace' => $talkns,
+                              'page_title' => $ttl ),
+                       $fname );
 
                # standard deferred updates
-               $this->editUpdates( $text );
+               $this->editUpdates( $text, $summary, $isminor, $now );
 
-               $this->showArticle( $text, wfMsg( 'newarticle' ) );
+               $oldid = 0; # new article
+               $this->showArticle( $text, wfMsg( 'newarticle' ), false, $isminor, $now, $summary, $oldid );
        }
 
-
-       /* Side effects: loads last edit */
-       function getTextOfLastEditWithSectionReplacedOrAdded($section, $text, $summary = ''){
-               $this->loadLastEdit();
-               $oldtext = $this->getContent( true );
+       /**
+        * Fetch and uncompress the text for a given revision.
+        * Can ask by rev_id number or timestamp (set $field)
+        */
+       function fetchRevisionText( $revId = null, $field = 'rev_id' ) {
+               $fname = 'Article::fetchRevisionText';
+               $dbw =& wfGetDB( DB_MASTER );
+               if( $revId ) {
+                       $rev = $dbw->addQuotes( $revId );
+               } else {
+                       $rev = 'page_latest';
+               }
+               $result = $dbw->query(
+                       sprintf( "SELECT old_text, old_flags
+                               FROM %s,%s,%s
+                               WHERE old_id=rev_id AND rev_page=page_id AND page_id=%d
+                               AND %s=%s",
+                               $dbw->tableName( 'page' ),
+                               $dbw->tableName( 'revision' ),
+                               $dbw->tableName( 'text' ),
+                               IntVal( $this->mTitle->getArticleId() ),
+                               $field,
+                               $rev ),
+                       $fname );
+               $obj = $dbw->fetchObject( $result );
+               $dbw->freeResult( $result );
+               $oldtext = Revision::getRevisionText( $obj );
+               return $oldtext;
+       }
+       
+       function getTextOfLastEditWithSectionReplacedOrAdded($section, $text, $summary = '', $edittime = NULL) {
+               $fname = 'Article::getTextOfLastEditWithSectionReplacedOrAdded';
+               if( is_null( $edittime ) ) {
+                       $oldtext = $this->fetchRevisionText();
+               } else {
+                       $oldtext = $this->fetchRevisionText( $edittime, 'rev_timestamp' );
+               }
                if ($section != '') {
                        if($section=='new') {
                                if($summary) $subject="== {$summary} ==\n\n";
@@ -822,7 +842,7 @@ class Article {
                                # split it up
                                # Unfortunately we can't simply do a preg_replace because that might
                                # replace the wrong section, so we have to use the section counter instead
-                               $secs=preg_split('/(^=+.*?=+|^<h[1-6].*?' . '>.*?<\/h[1-6].*?' . '>)/mi',
+                               $secs=preg_split('/(^=+.+?=+|^<h[1-6].*?' . '>.*?<\/h[1-6].*?' . '>)(?!\S)/mi',
                                  $oldtext,-1,PREG_SPLIT_DELIM_CAPTURE);
                                $secs[$section*2]=$text."\n\n"; // replace with edited
 
@@ -834,7 +854,7 @@ class Article {
                                        # be erased, as the mother section has been replaced with
                                        # the text of all subsections.
                                        $headline=$secs[$section*2-1];
-                                       preg_match( '/^(=+).*?=+|^<h([1-6]).*?' . '>.*?<\/h[1-6].*?' . '>/mi',$headline,$matches);
+                                       preg_match( '/^(=+).+?=+|^<h([1-6]).*?' . '>.*?<\/h[1-6].*?' . '>(?!\S)/mi',$headline,$matches);
                                        $hlevel=$matches[1];
 
                                        # determine headline level for wikimarkup headings
@@ -849,7 +869,7 @@ class Article {
 
                                                $subheadline=$secs[$count*2-1];
                                                preg_match(
-                                                '/^(=+).*?=+|^<h([1-6]).*?' . '>.*?<\/h[1-6].*?' . '>/mi',$subheadline,$matches);
+                                                '/^(=+).+?=+|^<h([1-6]).*?' . '>.*?<\/h[1-6].*?' . '>(?!\S)/mi',$subheadline,$matches);
                                                $subhlevel=$matches[1];
                                                if(strpos($subhlevel,'=')!==false) {
                                                        $subhlevel=strlen($subhlevel);
@@ -877,95 +897,118 @@ class Article {
                return $text;
        }
 
-       function updateArticle( $text, $summary, $minor, $watchthis, $forceBot = false, $sectionanchor = '' )
-       {
-               global $wgOut, $wgUser, $wgLinkCache;
+       /**
+        * Change an existing article. Puts the previous version back into the old table, updates RC 
+        * and all necessary caches, mostly via the deferred update array.
+        *
+        * It is possible to call this function from a command-line script, but note that you should 
+        * first set $wgUser, and clean up $wgDeferredUpdates after each edit.
+        */
+       function updateArticle( $text, $summary, $minor, $watchthis, $forceBot = false, $sectionanchor = '' ) {
+               global $wgOut, $wgUser;
                global $wgDBtransactions, $wgMwRedir;
                global $wgUseSquid, $wgInternalServer;
-               global $wgIsPg;
+
                $fname = 'Article::updateArticle';
+               $good = true;
 
                if ( $this->mMinorEdit ) { $me1 = 1; } else { $me1 = 0; }
-               if ( $minor && $wgUser->getID() ) { $me2 = 1; } else { $me2 = 0; }
-               if ( preg_match( "/^((" . $wgMwRedir->getBaseRegex() . ')[^\\n]+)/i', $text, $m ) ) {
-                       $redir = 1;
-                       $text = $m[1] . "\n"; # Remove all content but redirect
+               if ( $minor && $wgUser->isLoggedIn() ) { $me2 = 1; } else { $me2 = 0; }
+               if ( $this->isRedirect( $text ) ) {
+                       # Remove all content but redirect
+                       # This could be done by reconstructing the redirect from a title given by 
+                       # Title::newFromRedirect(), but then we wouldn't know which synonym the user
+                       # wants to see
+                       if ( preg_match( "/^((" . $wgMwRedir->getBaseRegex() . ')[^\\n]+)/i', $text, $m ) ) {
+                               $redir = 1;
+                               $text = $m[1] . "\n";
+                       }
                }
                else { $redir = 0; }
 
                $text = $this->preSaveTransform( $text );
+               $dbw =& wfGetDB( DB_MASTER );
 
                # Update article, but only if changed.
 
+               # It's important that we either rollback or complete, otherwise an attacker could
+               # overwrite cur entries by sending precisely timed user aborts. Random bored users
+               # could conceivably have the same effect, especially if cur is locked for long periods.
                if( $wgDBtransactions ) {
-                       $sql = 'BEGIN';
-                       wfQuery( $sql, DB_WRITE );
+                       $dbw->query( 'BEGIN', $fname );
+               } else {
+                       $userAbort = ignore_user_abort( true );
                }
+
                $oldtext = $this->getContent( true );
 
                if ( 0 != strcmp( $text, $oldtext ) ) {
                        $this->mCountAdjustment = $this->isCountable( $text )
                          - $this->isCountable( $oldtext );
-
                        $now = wfTimestampNow();
-                       $won = wfInvertTimestamp( $now );
-                       $sql = "UPDATE cur SET cur_text='" . wfStrencode( $text ) .
-                         "',cur_comment='" .  wfStrencode( $summary ) .
-                         "',cur_minor_edit={$me2}, cur_user=" . $wgUser->getID() .
-                         ",cur_timestamp='{$now}',cur_user_text='" .
-                         wfStrencode( $wgUser->getName() ) .
-                         "',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, 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 );
+                       $mungedText = $text;
+                       $flags = Revision::compressRevisionText( $mungedText );
+                       
+                       $lastRevision = $dbw->selectField(
+                               'page', 'page_latest', array( 'page_id' => $this->getId() ) );
+                       
+                       # Record the text to the text table
+                       $old_id = $dbw->nextSequenceValue( 'text_old_id_val' );
+                       $dbw->insert( 'text',
+                               array(
+                                       'old_id' => $old_id,
+                                       'old_text' => $mungedText,
+                                       'old_flags' => $flags,
+                               ), $fname
+                       );
+                       $revisionId = $dbw->insertId();
+                       
+                       # Record the edit in revisions
+                       $dbw->insert( 'revision',
+                               array(
+                                       'rev_id' => $revisionId,
+                                       'rev_page' => $this->getID(),
+                                       'rev_comment' => $summary,
+                                       'rev_minor_edit' => $me2,
+                                       'rev_user' => $wgUser->getID(),
+                                       'rev_user_text' => $wgUser->getName(),
+                                       'rev_timestamp' => $dbw->timestamp( $now ),
+                               ), $fname
+                       );
+                       
+                       # Update page
+                       $dbw->update( 'page',
+                               array( /* SET */
+                                       'page_latest' => $revisionId,
+                                       'page_touched' => $dbw->timestamp( $now ),
+                                       'page_is_new' => 0,
+                                       'page_is_redirect' => $redir,
+                               ), array( /* WHERE */
+                                       'page_id' => $this->getID(),
+                                       'page_latest' => $lastRevision, # Paranoia
+                               ), $fname
+                       );
 
-                       $oldtable=$wgIsPg?'"old"':'old';
-                       if ($wgIsPg) {
-                               $oldtable='"old"';
-                               $old_id_column='old_id,';
-                               $old_id=wfGetSQL(""," nextval('old_old_id_seq')");
-                               $old_id_value=$old_id.',';
+                       if( $dbw->affectedRows() == 0 ) {
+                               /* Belated edit conflict! Run away!! */
+                               $good = false;
                        } else {
-                               $oldtable='old';
-                               $old_id_column='';
-                               $old_id_value='';
+                               # Update recentchanges and purge cache and whatnot
+                               $bot = (int)($wgUser->isBot() || $forceBot);
+                               RecentChange::notifyEdit( $now, $this->mTitle, $me2, $wgUser, $summary,
+                                       $lastRevision, $this->getTimestamp(), $bot );
+                               Article::onArticleEdit( $this->mTitle );
                        }
-
-                       $sql = "INSERT INTO $oldtable ({$old_id_column}old_namespace,old_title,old_text," .
-                         'old_comment,old_user,old_user_text,old_timestamp,' .
-                         'old_minor_edit,inverse_timestamp,old_flags) VALUES (' .
-                         $old_id_value.
-                         $this->mTitle->getNamespace() . ", '" .
-                         wfStrencode( $this->mTitle->getDBkey() ) . "', '" .
-                         wfStrencode( $oldtext ) . "', '" .
-                         wfStrencode( $this->getComment() ) . "', " .
-                         $this->getUser() . ", '" .
-                         wfStrencode( $this->getUserText() ) . "', '" .
-                         $this->getTimestamp() . "', " . $me1 . ", '" .
-                         wfInvertTimestamp( $this->getTimestamp() ) . "','$flags')";
-                       $res = wfQuery( $sql, DB_WRITE, $fname );
-
-                       $oldid = $wgIsPg?$old_id:wfInsertId( $res );
-
-                       $bot = (int)($wgUser->isBot() || $forceBot);
-                       RecentChange::notifyEdit( $now, $this->mTitle, $me2, $wgUser, $summary,
-                               $oldid, $this->getTimestamp(), $bot );
-                       Article::onArticleEdit( $this->mTitle );
                }
 
                if( $wgDBtransactions ) {
-                       $sql = 'COMMIT';
-                       wfQuery( $sql, DB_WRITE );
+                       $dbw->query( 'COMMIT', $fname );
+               } else {
+                       ignore_user_abort( $userAbort );
                }
 
+               if ( $good ) {
                if ($watchthis) {
                        if (!$this->mTitle->userIsWatching()) $this->watch();
                } else {
@@ -974,7 +1017,7 @@ class Article {
                        }
                }
                # standard deferred updates
-               $this->editUpdates( $text );
+               $this->editUpdates( $text, $summary, $minor, $now );
 
 
                $urls = array();
@@ -984,9 +1027,9 @@ class Article {
                        $titles = $this->mTitle->getLinksTo();
                        Title::touchArray( $titles );
                        if ( $wgUseSquid ) {
-                               foreach ( $titles as $title ) {
-                                       $urls[] = $title->getInternalURL();
-                               }
+                                       foreach ( $titles as $title ) {
+                                               $urls[] = $title->getInternalURL();
+                                       }
                        }
                }
 
@@ -997,43 +1040,95 @@ class Article {
                        $u->doUpdate();
                }
 
-               $this->showArticle( $text, wfMsg( 'updated' ), $sectionanchor );
-               return true;
+               $this->showArticle( $text, wfMsg( 'updated' ), $sectionanchor, $me2, $now, $summary, $lastRevision );
+               }
+               return $good;
        }
 
-       # After we've either updated or inserted the article, update
-       # the link tables and redirect to the new page.
-
-       function showArticle( $text, $subtitle , $sectionanchor = '' )
-       {
-               global $wgOut, $wgUser, $wgLinkCache;
-               global $wgMwRedir;
+       /**
+        * After we've either updated or inserted the article, update
+        * the link tables and redirect to the new page.
+        */
+       function showArticle( $text, $subtitle , $sectionanchor = '', $me2, $now, $summary, $oldid ) {
+               global $wgOut, $wgUser, $wgLinkCache, $wgEnotif;
 
                $wgLinkCache = new LinkCache();
+               # Select for update
+               $wgLinkCache->forUpdate( true );
 
                # Get old version of link table to allow incremental link updates
                $wgLinkCache->preFill( $this->mTitle );
                $wgLinkCache->clear();
 
-               # Now update the link cache by parsing the text
+               # Parse the text and replace links with placeholders
                $wgOut = new OutputPage();
                $wgOut->addWikiText( $text );
 
-               if( $wgMwRedir->matchStart( $text ) )
+               # Look up the links in the DB and add them to the link cache
+               $wgOut->transformBuffer( RLH_FOR_UPDATE );
+
+               if( $this->isRedirect( $text ) )
                        $r = 'redirect=no';
                else
                        $r = '';
                $wgOut->redirect( $this->mTitle->getFullURL( $r ).$sectionanchor );
+
+               # this call would better fit into RecentChange::notifyEdit and RecentChange::notifyNew .
+               # this will be improved later (to-do)
+
+               include_once( "UserMailer.php" );
+               $wgEnotif = new EmailNotification ();
+               $wgEnotif->NotifyOnPageChange( $wgUser->getID(), $this->mTitle->getDBkey(), $this->mTitle->getNamespace(),$now, $summary, $me2, $oldid );
        }
 
-       # Add this page to my watchlist
+       /**
+        * Mark this particular edit as patrolled
+        */
+       function markpatrolled() {
+               global $wgOut, $wgRequest, $wgOnlySysopsCanPatrol, $wgUseRCPatrol, $wgUser;
+               $wgOut->setRobotpolicy( 'noindex,follow' );
 
-       function watch( $add = true )
-       {
-               global $wgUser, $wgOut, $wgLang;
-               global $wgDeferredUpdateList;
+               if ( !$wgUseRCPatrol )
+               {
+                       $wgOut->errorpage( 'rcpatroldisabled', 'rcpatroldisabledtext' );
+                       return;
+               }
+               if ( $wgUser->isAnon() )
+               {
+                       $wgOut->loginToUse();
+                       return;
+               }
+               if ( $wgOnlySysopsCanPatrol && !$wgUser->isAllowed('patrol') )
+               {
+                       $wgOut->sysopRequired();
+                       return;
+               }
+               $rcid = $wgRequest->getVal( 'rcid' );
+               if ( !is_null ( $rcid ) )
+               {
+                       RecentChange::markPatrolled( $rcid );
+                       $wgOut->setPagetitle( wfMsg( 'markedaspatrolled' ) );
+                       $wgOut->addWikiText( wfMsg( 'markedaspatrolledtext' ) );
+
+                       $rcTitle = Title::makeTitle( NS_SPECIAL, 'Recentchanges' );
+                       $wgOut->returnToMain( false, $rcTitle->getPrefixedText() );
+               }
+               else
+               {
+                       $wgOut->errorpage( 'markedaspatrollederror', 'markedaspatrollederrortext' );
+               }
+       }
+
+
+       /**
+        * Add this page to $wgUser's watchlist
+        */
+       
+       function watch() {
+               
+               global $wgUser, $wgOut;
 
-               if ( 0 == $wgUser->getID() ) {
+               if ( $wgUser->isAnon() ) {
                        $wgOut->errorpage( 'watchnologin', 'watchnologintext' );
                        return;
                }
@@ -1041,39 +1136,67 @@ class Article {
                        $wgOut->readOnlyPage();
                        return;
                }
-               if( $add )
-                       $wgUser->addWatch( $this->mTitle );
-               else
-                       $wgUser->removeWatch( $this->mTitle );
-
-               $wgOut->setPagetitle( wfMsg( $add ? 'addedwatch' : 'removedwatch' ) );
-               $wgOut->setRobotpolicy( 'noindex,follow' );
 
-               $sk = $wgUser->getSkin() ;
-               $link = $this->mTitle->getPrefixedText();
-
-               if($add)
+               if (wfRunHooks('WatchArticle', $wgUser, $this)) {
+                       
+                       $wgUser->addWatch( $this->mTitle );
+                       $wgUser->saveSettings();
+
+                       wfRunHooks('WatchArticleComplete', $wgUser, $this);
+                       
+                       $wgOut->setPagetitle( wfMsg( 'addedwatch' ) );
+                       $wgOut->setRobotpolicy( 'noindex,follow' );
+                       
+                       $link = $this->mTitle->getPrefixedText();
                        $text = wfMsg( 'addedwatchtext', $link );
-               else
-                       $text = wfMsg( 'removedwatchtext', $link );
-               $wgOut->addWikiText( $text );
+                       $wgOut->addWikiText( $text );
+               }
+               
+               $wgOut->returnToMain( true, $this->mTitle->getPrefixedText() );
+       }
 
-               $up = new UserUpdate();
-               array_push( $wgDeferredUpdateList, $up );
+       /**
+        * Stop watching a page
+        */
+       
+       function unwatch() {
 
-               $wgOut->returnToMain( false );
-       }
+               global $wgUser, $wgOut;
 
-       function unwatch()
-       {
-               $this->watch( false );
+               if ( $wgUser->isAnon() ) {
+                       $wgOut->errorpage( 'watchnologin', 'watchnologintext' );
+                       return;
+               }
+               if ( wfReadOnly() ) {
+                       $wgOut->readOnlyPage();
+                       return;
+               }
+
+               if (wfRunHooks('UnwatchArticle', $wgUser, $this)) {
+                       
+                       $wgUser->removeWatch( $this->mTitle );
+                       $wgUser->saveSettings();
+                       
+                       wfRunHooks('UnwatchArticleComplete', $wgUser, $this);
+                       
+                       $wgOut->setPagetitle( wfMsg( 'removedwatch' ) );
+                       $wgOut->setRobotpolicy( 'noindex,follow' );
+                       
+                       $link = $this->mTitle->getPrefixedText();
+                       $text = wfMsg( 'removedwatchtext', $link );
+                       $wgOut->addWikiText( $text );
+               }
+               
+               $wgOut->returnToMain( true, $this->mTitle->getPrefixedText() );
        }
 
-       function protect( $limit = 'sysop' )
-       {
+       /**
+        * protect a page
+        */
+       function protect( $limit = 'sysop' ) {
                global $wgUser, $wgOut, $wgRequest;
 
-               if ( ! $wgUser->isSysop() ) {
+               if ( ! $wgUser->isAllowed('protect') ) {
                        $wgOut->sysopRequired();
                        return;
                }
@@ -1087,22 +1210,49 @@ class Article {
                        return;
                }
 
-               $confirm = $wgRequest->getBool( 'wpConfirmProtect' ) && $wgRequest->wasPosted();
+               $confirm = $wgRequest->getBool( 'wpConfirmProtect' ) &&
+                       $wgRequest->wasPosted() &&
+                       $wgUser->matchEditToken( $wgRequest->getVal( 'wpEditToken' ) );
+               $moveonly = $wgRequest->getBool( 'wpMoveOnly' );
                $reason = $wgRequest->getText( 'wpReasonProtect' );
 
                if ( $confirm ) {
+                       $dbw =& wfGetDB( DB_MASTER );
+                       $dbw->update( 'page',
+                               array( /* SET */
+                                       'page_touched' => $dbw->timestamp(),
+                                       'page_restrictions' => (string)$limit
+                               ), array( /* WHERE */
+                                       'page_id' => $id
+                               ), 'Article::protect'
+                       );
 
-                       $sql = "UPDATE cur SET cur_touched='" . wfTimestampNow() . "'," .
-                               "cur_restrictions='{$limit}' WHERE cur_id={$id}";
-                       wfQuery( $sql, DB_WRITE, 'Article::protect' );
-
-                       $log = new LogPage( wfMsg( 'protectlogpage' ), wfMsg( 'protectlogtext' ) );
-                       if ( $limit === "" ) {
-                                       $log->addEntry( wfMsg( 'unprotectedarticle', $this->mTitle->getPrefixedText() ), $reason );
-                       } else {
-                                       $log->addEntry( wfMsg( 'protectedarticle', $this->mTitle->getPrefixedText() ), $reason );
+                       $restrictions = "move=" . $limit;
+                       if( !$moveonly ) {
+                               $restrictions .= ":edit=" . $limit;
+                       }
+                       if (wfRunHooks('ArticleProtect', $this, $wgUser, $limit == 'sysop', $reason, $moveonly)) {
+                               
+                               $dbw =& wfGetDB( DB_MASTER );
+                               $dbw->update( 'page',
+                                                         array( /* SET */
+                                                                        'page_touched' => $dbw->timestamp(),
+                                                                        'page_restrictions' => $restrictions
+                                                                        ), array( /* WHERE */
+                                                                                          'page_id' => $id
+                                                                                          ), 'Article::protect'
+                                                         );
+                               
+                               wfRunHooks('ArticleProtectComplete', $this, $wgUser, $limit == 'sysop', $reason, $moveonly);
+                               
+                               $log = new LogPage( 'protect' );
+                               if ( $limit === '' ) {
+                                       $log->addEntry( 'unprotect', $this->mTitle, $reason );
+                               } else {
+                                       $log->addEntry( 'protect', $this->mTitle, $reason );
+                               }
+                               $wgOut->redirect( $this->mTitle->getFullURL() );
                        }
-                       $wgOut->redirect( $this->mTitle->getFullURL() );
                        return;
                } else {
                        $reason = htmlspecialchars( wfMsg( 'protectreason' ) );
@@ -1110,10 +1260,11 @@ class Article {
                }
        }
 
-               # Output protection confirmation dialog
-       function confirmProtect( $par, $reason, $limit = 'sysop'  )
-       {
-               global $wgOut;
+       /**
+        * Output protection confirmation dialog
+        */
+       function confirmProtect( $par, $reason, $limit = 'sysop'  ) {
+               global $wgOut, $wgUser;
 
                wfDebug( "Article::confirmProtect\n" );
 
@@ -1122,6 +1273,7 @@ class Article {
 
                $check = '';
                $protcom = '';
+               $moveonly = '';
 
                if ( $limit === '' ) {
                        $wgOut->setPageTitle( wfMsg( 'confirmunprotect' ) );
@@ -1135,11 +1287,13 @@ class Article {
                        $wgOut->setSubtitle( wfMsg( 'protectsub', $sub ) );
                        $wgOut->addWikiText( wfMsg( 'confirmprotecttext' ) );
                        $check = htmlspecialchars( wfMsg( 'confirmprotect' ) );
+                       $moveonly = htmlspecialchars( wfMsg( 'protectmoveonly' ) );
                        $protcom = htmlspecialchars( wfMsg( 'protectcomment' ) );
                        $formaction = $this->mTitle->escapeLocalURL( 'action=protect' . $par );
                }
 
                $confirm = htmlspecialchars( wfMsg( 'confirm' ) );
+               $token = htmlspecialchars( $wgUser->editToken() );
 
                $wgOut->addHTML( "
 <form id='protectconfirm' method='post' action=\"{$formaction}\">
@@ -1162,7 +1316,19 @@ class Article {
                        <td>
                                <label for='wpConfirmProtect'>{$check}</label>
                        </td>
-               </tr>
+               </tr> " );
+               if($moveonly != '') {
+                       $wgOut->AddHTML( "
+               <tr>
+                       <td align='right'>
+                               <input type='checkbox' name='wpMoveOnly' value='1' id='wpMoveOnly' />
+                       </td>
+                       <td>
+                               <label for='wpMoveOnly'>{$moveonly}</label>
+                       </td>
+               </tr> " );
+               }
+               $wgOut->addHTML( "
                <tr>
                        <td>&nbsp;</td>
                        <td>
@@ -1170,28 +1336,34 @@ class Article {
                        </td>
                </tr>
        </table>
+       <input type='hidden' name='wpEditToken' value=\"{$token}\" />
 </form>\n" );
 
                $wgOut->returnToMain( false );
        }
 
-       function unprotect()
-       {
+       /**
+        * Unprotect the pages
+        */
+       function unprotect() {
                return $this->protect( '' );
        }
 
-       # UI entry point for page deletion
-       function delete()
-       {
-               global $wgUser, $wgOut, $wgMessageCache, $wgRequest, $wgIsPg;
+       /*
+        * UI entry point for page deletion
+        */
+       function delete() {
+               global $wgUser, $wgOut, $wgMessageCache, $wgRequest;
                $fname = 'Article::delete';
-               $confirm = $wgRequest->getBool( 'wpConfirm' ) && $wgRequest->wasPosted();
+               $confirm = $wgRequest->getBool( 'wpConfirm' ) &&
+                       $wgRequest->wasPosted() &&
+                       $wgUser->matchEditToken( $wgRequest->getVal( 'wpEditToken' ) );
                $reason = $wgRequest->getText( 'wpReason' );
 
                # This code desperately needs to be totally rewritten
 
                # Check permissions
-               if ( ( ! $wgUser->isSysop() ) ) {
+               if ( ( ! $wgUser->isAllowed('delete') ) ) {
                        $wgOut->sysopRequired();
                        return;
                }
@@ -1216,31 +1388,44 @@ class Article {
                # determine whether this page has earlier revisions
                # and insert a warning if it does
                # we select the text because it might be useful below
+               $dbr =& $this->getDB();
                $ns = $this->mTitle->getNamespace();
                $title = $this->mTitle->getDBkey();
-               $etitle = wfStrencode( $title );
-               $oldtable=$wgIsPg?'"old"':'old';
-               $sql = "SELECT old_text,old_flags FROM $oldtable 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 ) {
+               $revisions = $dbr->select( array( 'page', 'revision' ),
+                       array( 'rev_id' ),
+                       array(
+                               'page_namespace' => $ns,
+                               'page_title' => $title,
+                               'rev_page = page_id'
+                       ), $fname, $this->getSelectOptions( array( 'ORDER BY' => 'rev_timestamp DESC' ) )
+               );
+
+               if( $dbr->numRows( $revisions ) > 1 && !$confirm ) {
                        $skin=$wgUser->getSkin();
                        $wgOut->addHTML('<b>'.wfMsg('historywarning'));
                        $wgOut->addHTML( $skin->historyLink() .'</b>');
                }
 
-               $sql="SELECT cur_text FROM cur WHERE cur_namespace=$ns and cur_title='$etitle'";
-               $res=wfQuery($sql, DB_READ, $fname);
-               if( ($s=wfFetchObject($res))) {
+               # Fetch cur_text
+               $s = $dbr->selectRow( array( 'page', 'text' ),
+                       array( 'old_text' ),
+                       array(
+                               'page_namespace' => $ns,
+                               'page_title' => $title,
+                               'page_latest = old_id'
+                       ), $fname, $this->getSelectOptions()
+               );
 
+               if( $s !== false ) {
                        # 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;
+                       if($s->old_text != '') {
+                               $text=$s->old_text;
                        } else {
-                               if($old) {
-                                       $text = Article::getRevisionText( $old );
+                               if($old) { # TODO
+                                       $text = Revision::getRevisionText( $old );
                                        $blanked = true;
                                }
 
@@ -1277,10 +1462,11 @@ class Article {
                return $this->confirmDelete( '', $reason );
        }
 
-       # Output deletion confirmation dialog
-       function confirmDelete( $par, $reason )
-       {
-               global $wgOut;
+       /**
+        * Output deletion confirmation dialog
+        */
+       function confirmDelete( $par, $reason ) {
+               global $wgOut, $wgUser;
 
                wfDebug( "Article::confirmDelete\n" );
 
@@ -1294,6 +1480,7 @@ class Article {
                $confirm = htmlspecialchars( wfMsg( 'confirm' ) );
                $check = htmlspecialchars( wfMsg( 'confirmcheck' ) );
                $delcom = htmlspecialchars( wfMsg( 'deletecomment' ) );
+               $token = htmlspecialchars( $wgUser->editToken() );
 
                $wgOut->addHTML( "
 <form id='deleteconfirm' method='post' action=\"{$formaction}\">
@@ -1324,54 +1511,62 @@ class Article {
                        </td>
                </tr>
        </table>
+       <input type='hidden' name='wpEditToken' value=\"{$token}\" />
 </form>\n" );
 
                $wgOut->returnToMain( false );
        }
 
-       # Perform a deletion and output success or failure messages
-       function doDelete( $reason )
-       {
-               global $wgOut, $wgUser, $wgLang;
-               $fname = 'Article::doDelete';
-               wfDebug( "$fname\n" );
-
-               if ( $this->doDeleteArticle( $reason ) ) {
-                       $deleted = $this->mTitle->getPrefixedText();
 
-                       $wgOut->setPagetitle( wfMsg( 'actioncomplete' ) );
-                       $wgOut->setRobotpolicy( 'noindex,nofollow' );
-
-                       $sk = $wgUser->getSkin();
-                       $loglink = $sk->makeKnownLink( $wgLang->getNsText(
-                         Namespace::getWikipedia() ) .
-                         ':' . wfMsg( 'dellogpage' ), wfMsg( 'deletionlog' ) );
-
-                       $text = wfMsg( "deletedtext", $deleted, $loglink );
+       /**
+        * Perform a deletion and output success or failure messages
+        */
+       function doDelete( $reason ) {
+               global $wgOut, $wgUser, $wgContLang;
+               $fname = 'Article::doDelete';
+               wfDebug( $fname."\n" );
 
-                       $wgOut->addHTML( '<p>' . $text . "</p>\n" );
-                       $wgOut->returnToMain( false );
-               } else {
-                       $wgOut->fatalError( wfMsg( 'cannotdelete' ) );
+               if (wfRunHooks('ArticleDelete', $this, $wgUser, $reason)) {
+                       if ( $this->doDeleteArticle( $reason ) ) {
+                               $deleted = $this->mTitle->getPrefixedText();
+                               
+                               $wgOut->setPagetitle( wfMsg( 'actioncomplete' ) );
+                               $wgOut->setRobotpolicy( 'noindex,nofollow' );
+                               
+                               $sk = $wgUser->getSkin();
+                               $loglink = $sk->makeKnownLink( $wgContLang->getNsText( NS_PROJECT ) .
+                                                                                          ':' . wfMsgForContent( 'dellogpage' ),
+                                                                                          wfMsg( 'deletionlog' ) );
+                               
+                               $text = wfMsg( 'deletedtext', $deleted, $loglink );
+                               
+                               $wgOut->addHTML( '<p>' . $text . "</p>\n" );
+                               $wgOut->returnToMain( false );
+                               wfRunHooks('ArticleDeleteComplete', $this, $wgUser, $reason);
+                       } else {
+                               $wgOut->fatalError( wfMsg( 'cannotdelete' ) );
+                       }
                }
        }
 
-       # Back-end article deletion
-       # Deletes the article with database consistency, writes logs, purges caches
-       # Returns success
-       function doDeleteArticle( $reason )
-       {
-               global $wgUser, $wgLang;
+       /**
+        * Back-end article deletion
+        * Deletes the article with database consistency, writes logs, purges caches
+        * Returns success
+        */
+       function doDeleteArticle( $reason ) {
+               global $wgUser;
                global  $wgUseSquid, $wgDeferredUpdateList, $wgInternalServer;
 
                $fname = 'Article::doDeleteArticle';
                wfDebug( $fname."\n" );
 
+               $dbw =& wfGetDB( DB_MASTER );
                $ns = $this->mTitle->getNamespace();
-               $t = wfStrencode( $this->mTitle->getDBkey() );
+               $t = $this->mTitle->getDBkey();
                $id = $this->mTitle->getArticleID();
 
-               if ( '' == $t || $id == 0 ) {
+               if ( $t == '' || $id == 0 ) {
                        return false;
                }
 
@@ -1399,71 +1594,57 @@ class Article {
                Title::touchArray( $linksTo );
 
                # Move article and history to the "archive" table
-               $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 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, 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, 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, DB_WRITE, $fname );
+               $dbw->insertSelect( 'archive', array( 'page','revision', 'text' ),
+                       array(
+                               'ar_namespace' => 'page_namespace',
+                               'ar_title' => 'page_title',
+                               'ar_text' => 'old_text',
+                               'ar_comment' => 'rev_comment',
+                               'ar_user' => 'rev_user',
+                               'ar_user_text' => 'rev_user_text',
+                               'ar_timestamp' => 'rev_timestamp',
+                               'ar_minor_edit' => 'rev_minor_edit',
+                               'ar_flags' => 0,
+                       ), array(
+                               'page_namespace' => $ns,
+                               'page_title' => $t,
+                               'page_id = rev_page AND old_id = rev_id'
+                       ), $fname
+               );
 
-               $sql = "DELETE FROM old WHERE old_namespace={$ns} AND " .
-                 "old_title='{$t}'";
-               wfQuery( $sql, DB_WRITE, $fname );
+               # Now that it's safely backed up, delete it
 
-               $sql = "DELETE FROM recentchanges WHERE rc_namespace={$ns} AND " .
-                 "rc_title='{$t}'";
-                       wfQuery( $sql, DB_WRITE, $fname );
+               $dbw->deleteJoin( 'text', 'revision', 'old_id', 'rev_id', array( "rev_page = {$id}" ), $fname );
+               $dbw->delete( 'revision', array( 'rev_page' => $id ), $fname );
+               $dbw->delete( 'page', array( 'page_id' => $id ), $fname);
+               $dbw->delete( 'recentchanges', array( 'rc_namespace' => $ns, 'rc_title' => $t ), $fname );
 
                # Finally, clean up the link tables
-               $t = wfStrencode( $this->mTitle->getPrefixedDBkey() );
+               $t = $this->mTitle->getPrefixedDBkey();
 
                Article::onArticleDelete( $this->mTitle );
 
-               $sql = 'INSERT INTO brokenlinks (bl_from,bl_to) VALUES ';
-               $first = true;
-
+               # Insert broken links
+               $brokenLinks = array();
                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 );
+                       $brokenLinks[] = array( 'bl_from' => $linkID, 'bl_to' => $t );
                }
+               $dbw->insert( 'brokenlinks', $brokenLinks, $fname, 'IGNORE' );
 
-               $sql = "DELETE FROM links WHERE l_to={$id}";
-               wfQuery( $sql, DB_WRITE, $fname );
+               # Delete live links
+               $dbw->delete( 'links', array( 'l_to' => $id ) );
+               $dbw->delete( 'links', array( 'l_from' => $id ) );
+               $dbw->delete( 'imagelinks', array( 'il_from' => $id ) );
+               $dbw->delete( 'brokenlinks', array( 'bl_from' => $id ) );
+               $dbw->delete( 'categorylinks', array( 'cl_from' => $id ) );
 
-               $sql = "DELETE FROM links WHERE l_from={$id}";
-               wfQuery( $sql, DB_WRITE, $fname );
-
-               $sql = "DELETE FROM imagelinks WHERE il_from={$id}";
-               wfQuery( $sql, DB_WRITE, $fname );
-
-               $sql = "DELETE FROM brokenlinks WHERE bl_from={$id}";
-               wfQuery( $sql, DB_WRITE, $fname );
-
-               $sql = "DELETE FROM categorylinks WHERE cl_from={$id}";
-               wfQuery( $sql, DB_WRITE, $fname );
-
-               $log = new LogPage( wfMsg( 'dellogpage' ), wfMsg( 'dellogpagetext' ) );
-               $art = $this->mTitle->getPrefixedText();
-               $log->addEntry( wfMsg( 'deletedarticle', $art ), $reason );
+               # Log the deletion
+               $log = new LogPage( 'delete' );
+               $log->addEntry( 'delete', $this->mTitle, $reason );
 
                # Clear the cached article id so the interface doesn't act like we exist
                $this->mTitle->resetArticleID( 0 );
@@ -1471,11 +1652,14 @@ class Article {
                return true;
        }
 
-       function rollback()
-       {
-               global $wgUser, $wgLang, $wgOut, $wgRequest, $wgIsMySQL, $wgIsPg;
+       /**
+        * Revert a modification
+        */
+       function rollback() {
+               global $wgUser, $wgOut, $wgRequest;
+               $fname = 'Article::rollback';
 
-               if ( ! $wgUser->isSysop() ) {
+               if ( ! $wgUser->isAllowed('rollback') ) {
                        $wgOut->sysopRequired();
                        return;
                }
@@ -1483,84 +1667,98 @@ class Article {
                        $wgOut->readOnlyPage( $this->getContent( true ) );
                        return;
                }
+               if( !$wgUser->matchEditToken( $wgRequest->getVal( 'token' ),
+                       array( $this->mTitle->getPrefixedText(),
+                               $wgRequest->getVal( 'from' ) )  ) ) {
+                       $wgOut->setPageTitle( wfMsg( 'rollbackfailed' ) );
+                       $wgOut->addWikiText( wfMsg( 'sessionfailure' ) );
+                       return;
+               }
+               $dbw =& wfGetDB( DB_MASTER );
 
                # Enhanced rollback, marks edits rc_bot=1
                $bot = $wgRequest->getBool( 'bot' );
 
                # Replace all this user's current edits with the next one down
-               $tt = wfStrencode( $this->mTitle->getDBKey() );
+               $tt = $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, DB_READ );
-               if( ($x = wfNumRows( $res )) != 1 ) {
+               # Get the last editor, lock table exclusively
+               $s = $dbw->selectRow( array( 'page', 'revision' ),
+                       array( 'page_id','rev_user','rev_user_text','rev_comment' ),
+                       array( 'page_title' => $tt, 'page_namespace' => $n ),
+                       $fname, 'FOR UPDATE'
+               );
+               if( $s === false ) {
                        # Something wrong
                        $wgOut->addHTML( wfMsg( 'notanarticle' ) );
                        return;
                }
-               $s = wfFetchObject( $res );
-               $ut = wfStrencode( $s->cur_user_text );
-               $uid = $s->cur_user;
-               $pid = $s->cur_id;
+               $ut = $dbw->strencode( $s->cur_user_text );
+               $uid = $s->rev_user;
+               $pid = $s->page_id;
 
                $from = str_replace( '_', ' ', $wgRequest->getVal( 'from' ) );
-               if( $from != $s->cur_user_text ) {
+               if( $from != $s->rev_user_text ) {
                        $wgOut->setPageTitle(wfmsg('rollbackfailed'));
                        $wgOut->addWikiText( wfMsg( 'alreadyrolled',
                                htmlspecialchars( $this->mTitle->getPrefixedText()),
                                htmlspecialchars( $from ),
-                               htmlspecialchars( $s->cur_user_text ) ) );
-                       if($s->cur_comment != '') {
+                               htmlspecialchars( $s->rev_user_text ) ) );
+                       if($s->rev_comment != '') {
                                $wgOut->addHTML(
                                        wfMsg('editcomment',
-                                       htmlspecialchars( $s->cur_comment ) ) );
+                                       htmlspecialchars( $s->rev_comment ) ) );
                        }
                        return;
                }
 
                # Get the last edit not by this guy
-
-               $use_index=$wgIsMySQL?"USE INDEX (name_title_timestamp)":"";
-               $oldtable=$wgIsPg?'"old"':'old';
-               $sql = 'SELECT old_text,old_user,old_user_text,old_timestamp,old_flags ' .
-               "FROM $oldtable {$use_index} " .
-               "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, DB_READ );
-               if( wfNumRows( $res ) != 1 ) {
+               $s = $dbw->selectRow( 'old',
+                       array( 'old_text','old_user','old_user_text','old_timestamp','old_flags' ),
+                       array(
+                               'old_namespace' => $n,
+                               'old_title' => $tt,
+                               "old_user <> {$uid} OR old_user_text <> '{$ut}'"
+                       ), $fname, array( 'FOR UPDATE', 'USE INDEX' => 'name_title_timestamp' )
+               );
+               if( $s === false ) {
                        # Something wrong
                        $wgOut->setPageTitle(wfMsg('rollbackfailed'));
                        $wgOut->addHTML( wfMsg( 'cantrollback' ) );
                        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 );
+                       $dbw->update( 'recentchanges',
+                               array( /* SET */
+                                       'rc_bot' => 1
+                               ), array( /* WHERE */
+                                       'rc_user' => $uid,
+                                       "rc_timestamp > '{$s->old_timestamp}'",
+                               ), $fname
+                       );
                }
 
                # Save it!
                $newcomment = wfMsg( 'revertpage', $s->old_user_text, $from );
                $wgOut->setPagetitle( wfMsg( 'actioncomplete' ) );
                $wgOut->setRobotpolicy( 'noindex,nofollow' );
-               $wgOut->addHTML( '<h2>' . $newcomment . "</h2>\n<hr />\n" );
-               $this->updateArticle( Article::getRevisionText( $s ), $newcomment, 1, $this->mTitle->userIsWatching(), $bot );
+               $wgOut->addHTML( '<h2>' . htmlspecialchars( $newcomment ) . "</h2>\n<hr />\n" );
+               $this->updateArticle( Revision::getRevisionText( $s ), $newcomment, 1, $this->mTitle->userIsWatching(), $bot );
                Article::onArticleEdit( $this->mTitle );
                $wgOut->returnToMain( false );
        }
 
 
-       # Do standard deferred updates after page view
-
-       /* private */ function viewUpdates()
-       {
+       /**
+        * Do standard deferred updates after page view
+        * @private
+        */
+       function viewUpdates() {
                global $wgDeferredUpdateList;
+               
                if ( 0 != $this->getID() ) {
                        global $wgDisableCounters;
                        if( !$wgDisableCounters ) {
@@ -1568,25 +1766,38 @@ class Article {
                                $u = new SiteStatsUpdate( 1, 0, 0 );
                                array_push( $wgDeferredUpdateList, $u );
                        }
-                       $u = new UserTalkUpdate( 0, $this->mTitle->getNamespace(),
-                         $this->mTitle->getDBkey() );
-                       array_push( $wgDeferredUpdateList, $u );
                }
-       }
+               
+               # Update newtalk status if user is reading their own
+               # talk page
 
-       # Do standard deferred updates after page edit.
-       # Every 1000th edit, prune the recent changes table.
+               global $wgUser;
+               if ($this->mTitle->getNamespace() == NS_USER_TALK &&
+                       $this->mTitle->getText() == $wgUser->getName()) {
+                       require_once( 'UserTalkUpdate.php' );
+                       $u = new UserTalkUpdate( 0, $this->mTitle->getNamespace(), $this->mTitle->getDBkey(), false, false, false );
+               }
+       }
 
-       /* private */ function editUpdates( $text )
-       {
+       /**
+        * Do standard deferred updates after page edit.
+        * Every 1000th edit, prune the recent changes table.
+        * @private
+        * @param string $text
+        */
+       function editUpdates( $text, $summary, $minoredit, $timestamp_of_pagechange) {
                global $wgDeferredUpdateList, $wgDBname, $wgMemc;
-               global $wgMessageCache;
+               global $wgMessageCache, $wgUser;
 
                wfSeedRandom();
                if ( 0 == mt_rand( 0, 999 ) ) {
-                       $cutoff = wfUnix2Timestamp( time() - ( 7 * 86400 ) );
-                       $sql = "DELETE FROM recentchanges WHERE rc_timestamp < '{$cutoff}'";
-                       wfQuery( $sql, DB_WRITE );
+                       # Periodically flush old entries from the recentchanges table.
+                       global $wgRCMaxAge;
+                       $dbw =& wfGetDB( DB_MASTER );
+                       $cutoff = $dbw->timestamp( time() - $wgRCMaxAge );
+                       $recentchanges = $dbw->tableName( 'recentchanges' );
+                       $sql = "DELETE FROM $recentchanges WHERE rc_timestamp < '{$cutoff}'";
+                       $dbw->query( $sql );
                }
                $id = $this->getID();
                $title = $this->mTitle->getPrefixedDBkey();
@@ -1602,8 +1813,14 @@ class Article {
                        $u = new SearchUpdate( $id, $title, $text );
                        array_push( $wgDeferredUpdateList, $u );
 
-                       $u = new UserTalkUpdate( 1, $this->mTitle->getNamespace(), $shortTitle );
-                       array_push( $wgDeferredUpdateList, $u );
+                       # If this is another user's talk page,
+                       # create a watchlist entry for this page
+                       
+                       if ($this->mTitle->getNamespace() == NS_USER_TALK &&
+                               $shortTitle != $wgUser->getName()) {
+                               require_once( 'UserTalkUpdate.php' );
+                               $u = new UserTalkUpdate( 1, $this->mTitle->getNamespace(), $shortTitle, $summary, $minoredit, $timestamp_of_pagechange);
+                       }
 
                        if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
                                $wgMessageCache->replace( $shortTitle, $text );
@@ -1611,29 +1828,41 @@ class Article {
                }
        }
 
-       /* private */ function setOldSubtitle()
-       {
-               global $wgLang, $wgOut;
+       /**
+        * @todo document this function
+        * @private
+        * @param string $oldid         Revision ID of this article revision
+        */
+       function setOldSubtitle( $oldid=0 ) {
+               global $wgLang, $wgOut, $wgUser;
 
                $td = $wgLang->timeanddate( $this->mTimestamp, true );
-               $r = wfMsg( 'revisionasof', $td );
-               $wgOut->setSubtitle( "({$r})" );
+               $sk = $wgUser->getSkin();
+               $lnk = $sk->makeKnownLinkObj ( $this->mTitle, wfMsg( 'currentrevisionlink' ) );
+               $prevlink = $sk->makeKnownLinkObj( $this->mTitle, wfMsg( 'previousrevision' ), 'direction=prev&oldid='.$oldid );
+               $nextlink = $sk->makeKnownLinkObj( $this->mTitle, wfMsg( 'nextrevision' ), 'direction=next&oldid='.$oldid );
+               $r = wfMsg( 'revisionasofwithlink', $td, $lnk, $prevlink, $nextlink );
+               $wgOut->setSubtitle( $r );
        }
 
-       # This function is called right before saving the wikitext,
-       # so we can do things like signatures and links-in-context.
-
-       function preSaveTransform( $text )
-       {
+       /**
+        * This function is called right before saving the wikitext,
+        * so we can do things like signatures and links-in-context.
+        *
+        * @param string $text
+        */
+       function preSaveTransform( $text ) {
                global $wgParser, $wgUser;
                return $wgParser->preSaveTransform( $text, $this->mTitle, $wgUser, ParserOptions::newFromUser( $wgUser ) );
        }
 
        /* 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)
+       /**
+        * checkLastModified returns true if it has taken care of all
+        * output to the client that is necessary for this request.
+        * (that is, it has sent a cached version of the page)
+        */
        function tryFileCache() {
                static $called = false;
                if( $called ) {
@@ -1643,11 +1872,6 @@ class Article {
                $called = true;
                if($this->isFileCacheable()) {
                        $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;
@@ -1662,7 +1886,11 @@ class Article {
                        wfDebug( " tryFileCache() - not cacheable\n" );
                }
        }
-
+       
+       /**
+        * Check if the page can be cached
+        * @return bool
+        */
        function isFileCacheable() {
                global $wgUser, $wgUseFileCache, $wgShowIPinHeader, $wgRequest;
                extract( $wgRequest->getValues( 'action', 'oldid', 'diff', 'redirect', 'printable' ) );
@@ -1670,10 +1898,10 @@ class Article {
                return $wgUseFileCache
                        and (!$wgShowIPinHeader)
                        and ($this->getID() != 0)
-                       and ($wgUser->getId() == 0)
+                       and ($wgUser->isAnon())
                        and (!$wgUser->getNewtalk())
-                       and ($this->mTitle->getNamespace() != Namespace::getSpecial())
-                       and ($action == 'view')
+                       and ($this->mTitle->getNamespace() != NS_SPECIAL )
+                       and (empty( $action ) || $action == 'view')
                        and (!isset($oldid))
                        and (!isset($diff))
                        and (!isset($redirect))
@@ -1681,122 +1909,141 @@ class Article {
                        and (!$this->mRedirectedFrom);
        }
 
-       # Loads cur_touched and returns a value indicating if it should be used
+       /**
+        * Loads cur_touched and returns a value indicating if it should be used
+        *
+        */
        function checkTouched() {
+               $fname = 'Article::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;
+               $dbr =& $this->getDB();
+               $s = $dbr->selectRow( 'page', array( 'page_touched', 'page_is_redirect' ),
+                       array( 'page_id' => $id ), $fname, $this->getSelectOptions() );
+               if( $s !== false ) {
+                       $this->mTouched = wfTimestamp( TS_MW, $s->page_touched );
+                       return !$s->page_is_redirect;
                } else {
                        return false;
                }
        }
 
-       # Edit an article without doing all that other stuff
+       /**
+        * Edit an article without doing all that other stuff
+        *
+        * @param string $text text submitted
+        * @param string $comment comment submitted
+        * @param integer $minor whereas it's a minor modification
+        */
        function quickEdit( $text, $comment = '', $minor = 0 ) {
-               global $wgUser, $wgMwRedir, $wgIsPg;
+               global $wgUser;
                $fname = 'Article::quickEdit';
+
+               #wfDebugDieBacktrace( "$fname called." );
+
                wfProfileIn( $fname );
 
+               $dbw =& wfGetDB( DB_MASTER );
                $ns = $this->mTitle->getNamespace();
                $dbkey = $this->mTitle->getDBkey();
-               $encDbKey = wfStrencode( $dbkey );
-               $timestamp = wfTimestampNow();
-
-               # Save to history
-                $oldtable=$wgIsPg?'"old"':'old';
-               $sql = "INSERT INTO $oldtable (old_namespace,old_title,old_text,old_comment,old_user,old_user_text,old_timestamp,inverse_timestamp)
-                 SELECT cur_namespace,cur_title,cur_text,cur_comment,cur_user,cur_user_text,cur_timestamp,99999999999999-cur_timestamp
-                 FROM cur WHERE cur_namespace=$ns AND cur_title='$encDbKey'";
-               wfQuery( $sql, DB_WRITE );
-
-               # Use the affected row count to determine if the article is new
-               $numRows = wfAffectedRows();
-
-               # Make an array of fields to be inserted
-               $fields = array(
-                       'cur_text' => $text,
-                       'cur_timestamp' => $timestamp,
-                       'cur_user' => $wgUser->getID(),
-                       'cur_user_text' => $wgUser->getName(),
-                       'inverse_timestamp' => wfInvertTimestamp( $timestamp ),
-                       'cur_comment' => $comment,
-                       'cur_is_redirect' => $wgMwRedir->matchStart( $text ) ? 1 : 0,
-                       'cur_minor_edit' => intval($minor),
-                       'cur_touched' => $timestamp,
-               );
-
-               if ( $numRows ) {
-                       # Update article
-                       $fields['cur_is_new'] = 0;
-                       wfUpdateArray( 'cur', $fields, array( 'cur_namespace' => $ns, 'cur_title' => $dbkey ), $fname );
-               } else {
-                       # Insert new article
-                       $fields['cur_is_new'] = 1;
-                       $fields['cur_namespace'] = $ns;
-                       $fields['cur_title'] = $dbkey;
-                       $fields['cur_random'] = $rand = number_format( mt_rand() / mt_getrandmax(), 12, '.', '' );
-                       wfInsertArray( 'cur', $fields, $fname );
-               }
+               $encDbKey = $dbw->strencode( $dbkey );
+               $timestamp = $dbw->timestamp();
+               # insert new text
+               $dbw->insert( 'text', array(
+                               'old_text' => $text,
+                               'old_flags' => "" ), $fname );
+               $text_id = $dbw->insertID();
+
+               # update page
+               $dbw->update( 'page', array(
+                       'page_is_new' => 0,
+                       'page_touched' => $timestamp,
+                       'page_is_redirect' => $this->isRedirect( $text ) ? 1 : 0,
+                       'page_latest' => $text_id ),
+                       array( 'page_namespace' => $ns, 'page_title' => $dbkey ), $fname );
+               # Retrieve page ID
+               $page_id = $dbw->selectField( 'page', 'page_id', array( 'page_namespace' => $ns, 'page_title' => $dbkey ), $fname );
+
+               # update revision
+               $dbw->insert( 'revision', array(
+                       'rev_id' => $text_id,
+                       'rev_page' => $page_id,
+                       'rev_comment' => $comment,
+                       'rev_user' => $wgUser->getID(),
+                       'rev_user_text' => $wgUser->getName(),
+                       'rev_timestamp' => $timestamp,
+                       'rev_minor_edit' => intval($minor) ),
+                       $fname );
                wfProfileOut( $fname );
        }
 
-       /* static */ function incViewCount( $id )
-       {
+       /**
+        * Used to increment the view counter
+        *
+        * @static
+        * @param integer $id article id
+        */
+       function incViewCount( $id ) {
                $id = intval( $id );
                global $wgHitcounterUpdateFreq;
 
+               $dbw =& wfGetDB( DB_MASTER );
+               $pageTable = $dbw->tableName( 'page' );
+               $hitcounterTable = $dbw->tableName( 'hitcounter' );
+               $acchitsTable = $dbw->tableName( 'acchits' );
+
                if( $wgHitcounterUpdateFreq <= 1 ){ //
-                       wfQuery('UPDATE cur SET cur_counter = cur_counter + 1 ' .
-                               'WHERE cur_id = '.$id, DB_WRITE);
+                       $dbw->query( "UPDATE $pageTable SET page_counter = page_counter + 1 WHERE page_id = $id" );
                        return;
                }
 
                # Not important enough to warrant an error page in case of failure
-               $oldignore = wfIgnoreSQLErrors( true );
+               $oldignore = $dbw->ignoreErrors( true );
 
-               wfQuery("INSERT INTO hitcounter (hc_id) VALUES ({$id})", DB_WRITE);
+               $dbw->query( "INSERT INTO $hitcounterTable (hc_id) VALUES ({$id})" );
 
                $checkfreq = intval( $wgHitcounterUpdateFreq/25 + 1 );
-               if( (rand() % $checkfreq != 0) or (wfLastErrno() != 0) ){
+               if( (rand() % $checkfreq != 0) or ($dbw->lastErrno() != 0) ){
                        # Most of the time (or on SQL errors), skip row count check
-                       wfIgnoreSQLErrors( $oldignore );
+                       $dbw->ignoreErrors( $oldignore );
                        return;
                }
 
-               $res = wfQuery('SELECT COUNT(*) as n FROM hitcounter', DB_WRITE);
-               $row = wfFetchObject( $res );
+               $res = $dbw->query("SELECT COUNT(*) as n FROM $hitcounterTable");
+               $row = $dbw->fetchObject( $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);
+                       $dbw->query("LOCK TABLES $hitcounterTable WRITE");
+                       $dbw->query("CREATE TEMPORARY TABLE $acchitsTable TYPE=HEAP ".
+                               "SELECT hc_id,COUNT(*) AS hc_n FROM $hitcounterTable ".
+                               'GROUP BY hc_id');
+                       $dbw->query("DELETE FROM $hitcounterTable");
+                       $dbw->query('UNLOCK TABLES');
+                       $dbw->query("UPDATE $curTable,$acchitsTable SET cur_counter=cur_counter + hc_n ".
+                               'WHERE cur_id = hc_id');
+                       $dbw->query("DROP TABLE $acchitsTable");
 
                        ignore_user_abort( $old_user_abort );
                        wfProfileOut( 'Article::incViewCount-collect' );
                }
-               wfIgnoreSQLErrors( $oldignore );
+               $dbw->ignoreErrors( $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){
+       /**#@+
+        * 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
+        * @param $title_obj a title object
+        */
+
+       function onArticleCreate($title_obj) {
                global $wgUseSquid, $wgDeferredUpdateList;
 
                $titles = $title_obj->getBrokenLinksTo();
@@ -1815,83 +2062,130 @@ class Article {
                LinkCache::linksccClearBrokenLinksTo( $title_obj->getPrefixedDBkey() );
        }
 
-       /* static */ function onArticleDelete($title_obj){
+       function onArticleDelete($title_obj) {
                LinkCache::linksccClearLinksTo( $title_obj->getArticleID() );
        }
-
-       /* static */ function onArticleEdit($title_obj){
+       function onArticleEdit($title_obj) {
                LinkCache::linksccClearPage( $title_obj->getArticleID() );
        }
+       /**#@-*/
+
+       /**
+        * Info about this page
+        * Called for ?action=info when $wgAllowPageInfo is on.
+        *
+        * @access public
+        */
+       function info() {
+               global $wgLang, $wgOut, $wgAllowPageInfo;
+               $fname = 'Article::info';
+
+               if ( !$wgAllowPageInfo ) {
+                       $wgOut->errorpage( 'nosuchaction', 'nosuchactiontext' );
+                       return;
+               }
 
-       # Info about this page
-
-       function info()
-       {
-               global $wgUser, $wgTitle, $wgOut, $wgLang;
-
-               $basenamespace = $wgTitle->getNamespace() & (~1);
-               $cur_clause = "cur_title='".$wgTitle->getDBkey()."' AND cur_namespace=".$basenamespace;
-               $old_clause = "old_title='".$wgTitle->getDBkey()."' AND old_namespace=".$basenamespace;
-               $wl_clause  =  "wl_title='".$wgTitle->getDBkey()."' AND  wl_namespace=".$basenamespace;
-               $fullTitle = $wgTitle->makeName($basenamespace, $wgTitle->getDBKey());
-               $wgOut->setPagetitle(  $fullTitle );
-               $wgOut->setSubtitle( wfMsg( "infosubtitle" ));
+               $page = $this->mTitle->getSubjectPage();
+               
+               $wgOut->setPagetitle( $page->getPrefixedText() );
+               $wgOut->setSubtitle( wfMsg( 'infosubtitle' ));
 
                # first, see if the page exists at all.
-               $sql = "SELECT COUNT(*) FROM cur WHERE ".$cur_clause;
-               $exists = wfSingleQuery( $sql , DB_READ );
-               if ($exists < 1) {
-                       $wgOut->addHTML( wfMsg("noarticletext") );
+               $exists = $page->getArticleId() != 0;
+               if( !$exists ) {
+                       $wgOut->addHTML( wfMsg('noarticletext') );
                } else {
-                       $sql = "SELECT COUNT(*) FROM watchlist WHERE ".$wl_clause;
-                       $wgOut->addHTML( "<ul><li>" . wfMsg("numwatchers") . wfSingleQuery( $sql, DB_READ ) . "</li>" );
-                       $sql = "SELECT COUNT(*) FROM old WHERE ".$old_clause;
-                       $old = wfSingleQuery( $sql, DB_READ );
-                       $wgOut->addHTML( "<li>" . wfMsg("numedits") . ($old + 1) . "</li>");
-
-                       # to find number of distinct authors, we need to do some
-                       # funny stuff because of the cur/old table split:
-                       # - first, find the name of the 'cur' author
-                       # - then, find the number of *other* authors in 'old'
-
-                       # find 'cur' author
-                       $sql = "SELECT cur_user_text FROM cur WHERE ".$cur_clause;
-                       $cur_author = wfSingleQuery( $sql, DB_READ );
-
-                       # find number of 'old' authors excluding 'cur' author
-                       $sql = "SELECT COUNT(DISTINCT old_user_text) FROM old WHERE ".$old_clause
-                                       ." AND old_user_text<>'" . $cur_author . "'";
-                       $authors = wfSingleQuery( $sql, DB_READ ) + 1;
-
-                       # now for the Talk page ...
-                       $cur_clause = "cur_title='".$wgTitle->getDBkey()."' AND cur_namespace=".($basenamespace+1);
-                       $old_clause = "old_title='".$wgTitle->getDBkey()."' AND old_namespace=".($basenamespace+1);
-
-                       # does it exist?
-                       $sql = "SELECT COUNT(*) FROM cur WHERE ".$cur_clause;
-                       $exists = wfSingleQuery( $sql , DB_READ );
-
-                       # number of edits
-                       if ($exists > 0) {
-                               $sql = "SELECT COUNT(*) FROM old WHERE ".$old_clause;
-                               $old = wfSingleQuery( $sql, DB_READ );
-                               $wgOut->addHTML( "<li>" . wfMsg("numtalkedits") . ($old + 1) . "</li>");
+                       $dbr =& $this->getDB( DB_SLAVE );       
+                       $wl_clause = array(
+                               'wl_title'     => $page->getDBkey(),
+                               'wl_namespace' => $page->getNamespace() );
+                       $numwatchers = $dbr->selectField(
+                               'watchlist',
+                               'COUNT(*)',
+                               $wl_clause,
+                               $fname,
+                               $this->getSelectOptions() );
+
+                       $pageInfo = $this->pageCountInfo( $page );
+                       $talkInfo = $this->pageCountInfo( $page->getTalkPage() );
+                       
+                       $wgOut->addHTML( "<ul><li>" . wfMsg("numwatchers", $wgLang->formatNum( $numwatchers ) ) . '</li>' );
+                       $wgOut->addHTML( "<li>" . wfMsg('numedits', $wgLang->formatNum( $pageInfo['edits'] ) ) . '</li>');
+                       if( $talkInfo ) {
+                               $wgOut->addHTML( '<li>' . wfMsg("numtalkedits", $wgLang->formatNum( $talkInfo['edits'] ) ) . '</li>');
                        }
-                       $wgOut->addHTML( "<li>" . wfMsg("numauthors") . $authors . "</li>" );
-
-                       # number of authors
-                       if ($exists > 0) {
-                               $sql = "SELECT cur_user_text FROM cur WHERE ".$cur_clause;
-                               $cur_author = wfSingleQuery( $sql, DB_READ );
+                       $wgOut->addHTML( '<li>' . wfMsg("numauthors", $wgLang->formatNum( $pageInfo['authors'] ) ) . '</li>' );
+                       if( $talkInfo ) {
+                               $wgOut->addHTML( '<li>' . wfMsg('numtalkauthors', $wgLang->formatNum( $talkInfo['authors'] ) ) . '</li>' );
+                       }
+                       $wgOut->addHTML( '</ul>' );
 
-                               $sql = "SELECT COUNT(DISTINCT old_user_text) FROM old WHERE "
-                                               .$old_clause." AND old_user_text<>'" . $cur_author . "'";
-                               $authors = wfSingleQuery( $sql, DB_READ ) + 1;
+               }
+       }
+       
+       /**
+        * Return the total number of edits and number of unique editors
+        * on a given page. If page does not exist, returns false.
+        *
+        * @param Title $title
+        * @return array
+        * @access private
+        */
+       function pageCountInfo( $title ) {
+               $id = $title->getArticleId();
+               if( $id == 0 ) {
+                       return false;
+               }
+               
+               $dbr =& $this->getDB( DB_SLAVE );       
+
+               $rev_clause = array( 'rev_page' => $id );
+               $fname = 'Article::pageCountInfo';
+
+               $edits = $dbr->selectField(
+                       'revision',
+                       'COUNT(rev_page)',
+                       $rev_clause,
+                       $fname,
+                       $this->getSelectOptions() );
+
+               $authors = $dbr->selectField(
+                       'revision',
+                       'COUNT(DISTINCT rev_user_text)',
+                       $rev_clause,
+                       $fname,
+                       $this->getSelectOptions() );
+               
+               return array( 'edits' => $edits, 'authors' => $authors );
+       }
+}
 
-                               $wgOut->addHTML( "<li>" . wfMsg("numtalkauthors") . $authors . "</li></ul>" );
-                       }
+/**
+ * Check whether an article is a stub
+ *
+ * @public
+ * @param integer $articleID   ID of the article that is to be checked
+ */
+function wfArticleIsStub( $articleID ) {
+       global $wgUser;
+       $fname = 'wfArticleIsStub';
+
+       wfDebugDieBacktrace( 'This function seems to be unused. Pending removal.' );
+
+       $threshold = $wgUser->getOption('stubthreshold') ;
+       if ( $threshold > 0 ) {
+               $dbr =& wfGetDB( DB_SLAVE );
+               $s = $dbr->selectRow( array('page', 'text'),
+                       array( 'LENGTH(old_text) AS len', 'page_namespace', 'page_is_redirect' ),
+                       array( 'page_id' => $articleID, "page.page_latest=text.old_id" ),
+                       $fname ) ;
+               if ( $s == false OR $s->page_is_redirect OR $s->page_namespace != NS_MAIN ) {
+                       return false;
                }
+               $size = $s->len;
+               return ( $size < $threshold );
        }
+       return false;
 }
 
 ?>