Fixed direction=prec/next style navigation of old revisions
[lhc/web/wiklou.git] / includes / Article.php
index 361b9d4..b361976 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
+ * @version $Id$
+ * @package MediaWiki
+ */
+
+/**
+ * Need the CacheManager to be loaded
+ */
 require_once ( 'CacheManager.php' );
-include_once ( 'SpecialValidate.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.
+ *
+ * @version $Id$
+ * @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;
+       /**#@-*/
+
+       /**
+        * Constructor and clear the article
+        * @param mixed &$title
+        */
        function Article( &$title ) {
                $this->mTitle =& $title;
                $this->clear();
        }
 
-       /* private */ function clear()
-       {
+       /**
+         * 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 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
+         * @param integer $row Id of a row
+         * @param string $prefix table prefix (default 'old_')
+         * @return string $text|false the text requested
+       */
+       function getRevisionText( $row, $prefix = 'old_' ) {
                # Get data
                $textField = $prefix . 'text';
                $flagsField = $prefix . 'flags';
 
-               if ( isset( $row->$flagsField ) ) {
-                       $flags = explode( ",", $row->$flagsField );
+               if( isset( $row->$flagsField ) ) {
+                       $flags = explode( ',', $row->$flagsField );
                } else {
                        $flags = array();
                }
 
-               if ( isset( $row->$textField ) ) {
+               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 ) ) {
+               if( 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 );
+                       $text = gzinflate( $text );
                }
-               return $text;
-       }
+                       
+               if( in_array( 'object', $flags ) ) {
+                       # Generic compressed storage
+                       $obj = unserialize( $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;
-                               }
+                       # Bugger, corrupted my test database by double-serializing
+                       if ( !is_object( $obj ) ) {
+                               $obj = unserialize( $obj );
                        }
-               }
 
-               if ( $hash === '' ) {
-                       return false;
+                       $text = $obj->getText();
                }
-
-               # Look in each specified location for the text
-               $text = false;
-               foreach ( $locations as $location ) {
-                       $text = Article::fetchFromLocation( $location, $hash );
-                       if ( $text !== false ) {
-                               break;
-                       }
+       
+               global $wgLegacyEncoding;
+               if( $wgLegacyEncoding && !in_array( 'utf-8', $flags ) ) {
+                       # Old revisions kept around in a legacy encoding?
+                       # Upconvert on demand.
+                       global $wgInputEncoding, $wgContLang;
+                       $text = $wgContLang->iconv( $wgLegacyEncoding, $wgInputEncoding, $text );
                }
-
                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( DB_SLAVE );
-                                       } 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, DBO_IGNORE );
-                                               }
-                                       }
-                                       if ( $db->isOpen() ) {
-                                               $index = $db->strencode( $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;
+       /**
+        * If $wgCompressRevisions is enabled, we will compress data.
+        * The input string is modified in place.
+        * Return value is the flags field: contains 'gzip' if the
+        * data is compressed, and 'utf-8' if we're saving in UTF-8
+        * mode.
+        *
+        * @static
+        * @param mixed $text reference to a text
+        * @return string
+        */
+       function compressRevisionText( &$text ) {
+               global $wgCompressRevisions, $wgUseLatin1;
+               $flags = array();
+               if( !$wgUseLatin1 ) {
+                       # Revisions not marked this way will be converted
+                       # on load if $wgLegacyCharset is set in the future.
+                       $flags[] = 'utf-8';
+               }
+               if( $wgCompressRevisions ) {
+                       if( function_exists( 'gzdeflate' ) ) {
+                               $text = gzdeflate( $text );
+                               $flags[] = 'gzip';
+                       } else {
+                               wfDebug( "Article::compressRevisionText() -- no zlib support, not compressing\n" );
                        }
                }
-               wfProfileOut( $fname );
-               return $text;
+               return implode( ',', $flags );
        }
 
-       # 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
@@ -246,13 +198,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)
@@ -265,14 +222,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
@@ -287,7 +244,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);
@@ -310,7 +267,9 @@ class Article {
 
        }
 
-       # Return an array of the columns of the "cur"-table
+       /**
+        * Return an array of the columns of the "cur"-table
+        */
        function &getCurContentFields() {
                global $wgArticleCurContentFields;
                if ( !$wgArticleCurContentFields ) {
@@ -320,7 +279,9 @@ class Article {
                return $wgArticleCurContentFields;
        }
 
-       # Return an array of the columns of the "old"-table
+       /**
+        * Return an array of the columns of the "old"-table
+        */
        function &getOldContentFields() {
                global $wgArticleOldContentFields;
                if ( !$wgArticleOldContentFields ) {
@@ -330,30 +291,70 @@ class Article {
                return $wgArticleOldContentFields;
        }
 
-       # Load the revision (including cur_text) into this object
-       function loadContent( $noredir = false )
-       {
-               global $wgOut, $wgMwRedir, $wgRequest;
+       /**
+        * 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;
+               }
 
-               $dbr =& wfGetDB( DB_SLAVE );
-               # Query variables :P
                $oldid = $wgRequest->getVal( 'oldid' );
-               $redirect = $wgRequest->getVal( 'redirect' );
+               if ( isset( $oldid ) ) {
+                       $dbr =& $this->getDB();
+                       $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;
+               
+               $dbr =& $this->getDB();
+               # 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}";
+                       $t .= ',oldid='.$oldid;
                }
                if ( isset( $redirect ) ) {
                        $redirect = ($redirect == 'no') ? 'no' : 'yes';
-                       $t .= ",redirect={$redirect}";
+                       $t .= ',redirect='.$redirect;
                }
                $this->mContent = wfMsg( 'missingarticle', $t );
 
@@ -361,7 +362,8 @@ class Article {
                        $id = $this->getID();
                        if ( 0 == $id ) return;
 
-                       $s = $dbr->getArray( 'cur', $this->getCurContentFields(), array( 'cur_id' => $id ), $fname );
+                       $s = $dbr->selectRow( 'cur', $this->getCurContentFields(), array( 'cur_id' => $id ), $fname,
+                               $this->getSelectOptions() );
                        if ( $s === false ) {
                                return;
                        }
@@ -370,7 +372,8 @@ class Article {
                        # not to by either the function parameter or the query
                        if ( ( 'no' != $redirect ) && ( false == $noredir ) ) {
                                $rt = Title::newFromRedirect( $s->cur_text );
-                               if ( $rt ) {
+                               # 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.
@@ -385,7 +388,8 @@ class Article {
                                        }
                                        $rid = $rt->getArticleID();
                                        if ( 0 != $rid ) {
-                                               $redirRow = $dbr->getArray( 'cur', $this->getCurContentFields(), array( 'cur_id' => $rid ), $fname );
+                                               $redirRow = $dbr->selectRow( 'cur', $this->getCurContentFields(),
+                                                       array( 'cur_id' => $rid ), $fname, $this->getSelectOptions() );
 
                                                if ( $redirRow !== false ) {
                                                        $this->mRedirectedFrom = $this->mTitle->getPrefixedText();
@@ -401,12 +405,13 @@ class Article {
                        $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->mTimestamp = wfTimestamp(TS_MW,$s->cur_timestamp);
+                       $this->mTouched = wfTimestamp(TS_MW,$s->cur_touched);
                        $this->mTitle->mRestrictions = explode( ',', trim( $s->cur_restrictions ) );
                        $this->mTitle->mRestrictionsLoaded = true;
                } else { # oldid set, retrieve historical version
-                       $s = $dbr->getArray( 'old', $this->getOldContentFields(), array( 'old_id' => $oldid ), $fname );
+                       $s = $dbr->selectRow( 'old', $this->getOldContentFields(), array( 'old_id' => $oldid ),
+                               $fname, $this->getSelectOptions() );
                        if ( $s === false ) {
                                return;
                        }
@@ -422,24 +427,26 @@ class Article {
                        $this->mUserText = $s->old_user_text;
                        $this->mComment = $s->old_comment;
                        $this->mCounter = 0;
-                       $this->mTimestamp = $s->old_timestamp;
+                       $this->mTimestamp = wfTimestamp(TS_MW,$s->old_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;
-
                if ( $this->mContentLoaded ) {
                        return $this->mContent;
                }
                $this->mContent = false;
 
                $fname = 'Article::getContentWithout';
-               $dbr =& wfGetDB( DB_SLAVE );
+               $dbr =& $this->getDB();
 
                if ( ! $oldid ) {       # Retrieve current version
                        $id = $this->getID();
@@ -447,7 +454,8 @@ class Article {
                                return false;
                        }
 
-                       $s = $dbr->getArray( 'cur', $this->getCurContentFields(), array( 'cur_id' => $id ), $fname );
+                       $s = $dbr->selectRow( 'cur', $this->getCurContentFields(), array( 'cur_id' => $id ),
+                               $fname, $this->getSelectOptions() );
                        if ( $s === false ) {
                                return false;
                        }
@@ -459,7 +467,8 @@ class Article {
                                if( $rt &&  $rt->getInterwiki() == '' && $rt->getNamespace() != NS_SPECIAL ) {
                                        $rid = $rt->getArticleID();
                                        if ( 0 != $rid ) {
-                                               $redirRow = $dbr->getArray( 'cur', $this->getCurContentFields(), array( 'cur_id' => $rid ), $fname );
+                                               $redirRow = $dbr->selectRow( 'cur', $this->getCurContentFields(),
+                                                       array( 'cur_id' => $rid ), $fname, $this->getSelectOptions() );
 
                                                if ( $redirRow !== false ) {
                                                        $this->mRedirectedFrom = $this->mTitle->getPrefixedText();
@@ -475,12 +484,13 @@ class Article {
                        $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->mTimestamp = wfTimestamp(TS_MW,$s->cur_timestamp);
+                       $this->mTouched = wfTimestamp(TS_MW,$s->cur_touched);
+                       $this->mTitle->mRestrictions = explode( ',', trim( $s->cur_restrictions ) );
                        $this->mTitle->mRestrictionsLoaded = true;
                } else { # oldid set, retrieve historical version
-                       $s = $dbr->getArray( 'old', $this->getOldContentFields(), array( 'old_id' => $oldid ) );
+                       $s = $dbr->selectRow( 'old', $this->getOldContentFields(), array( 'old_id' => $oldid ),
+                               $fname, $this->getSelectOptions() );
                        if ( $s === false ) {
                                return false;
                        }
@@ -489,12 +499,48 @@ class Article {
                        $this->mUserText = $s->old_user_text;
                        $this->mComment = $s->old_comment;
                        $this->mCounter = 0;
-                       $this->mTimestamp = $s->old_timestamp;
+                       $this->mTimestamp = wfTimestamp(TS_MW,$s->old_timestamp);
                }
                $this->mContentLoaded = true;
                return $this->mContent;
        }
 
+       /**
+        * Read/write accessor to select FOR UPDATE
+        */
+       function forUpdate( $x = NULL ) {
+               return wfSetVar( $this->mForUpdate, $x );
+       }
+
+       /**
+        * Get the database which should be used for reads
+        */
+       function &getDB() {
+               if ( $this->mForUpdate ) {
+                       return wfGetDB( DB_MASTER );
+               } else {
+                       return wfGetDB( DB_SLAVE );
+               }
+       }
+
+       /**
+        * 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 ( $options ) {
+                               $options[] = 'FOR UPDATE';
+                       } else {
+                               $options = 'FOR UPDATE';
+                       }
+               }
+               return $options;
+       }
+
+       /**
+        * Return the Article ID
+        */
        function getID() {
                if( $this->mTitle ) {
                        return $this->mTitle->getArticleID();
@@ -503,96 +549,107 @@ class Article {
                }
        }
 
-       function getCount()
-       {
+       /**
+        * Get the view count for this article
+        */
+       function getCount() {
                if ( -1 == $this->mCounter ) {
                        $id = $this->getID();
-                       $dbr =& wfGetDB( DB_SLAVE );
-                       $this->mCounter = $dbr->getField( 'cur', 'cur_counter', "cur_id={$id}" );
+                       $dbr =& $this->getDB();
+                       $this->mCounter = $dbr->selectField( 'cur', 'cur_counter', 'cur_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;
+       /**
+        * Would the given text make this article a "good" article (i.e.,
+        * suitable for including in the article count)?
+        */
+       function isCountable( $text ) {
+               global $wgUseCommaCount;
 
                if ( 0 != $this->mTitle->getNamespace() ) { return 0; }
-               if ( $wgMwRedir->matchStart( $text ) ) { 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 from cur except cur_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;
 
                $fname = 'Article::loadLastEdit';
 
-               $dbr =& wfGetDB( DB_SLAVE );
-               $s = $dbr->getArray( 'cur',
+               $dbr =& $this->getDB();
+               $s = $dbr->selectRow( 'cur',
                  array( 'cur_user','cur_user_text','cur_timestamp', 'cur_comment','cur_minor_edit' ),
-                 array( 'cur_id' => $this->getID() ), $fname );
+                 array( 'cur_id' => $this->getID() ), $fname, $this->getSelectOptions() );
 
                if ( $s !== false ) {
                        $this->mUser = $s->cur_user;
                        $this->mUserText = $s->cur_user_text;
-                       $this->mTimestamp = $s->cur_timestamp;
+                       $this->mTimestamp = wfTimestamp(TS_MW,$s->cur_timestamp);
                        $this->mComment = $s->cur_comment;
                        $this->mMinorEdit = $s->cur_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';
+       function getContributors($limit = 0, $offset = 0) {
+               $fname = 'Article::getContributors';
 
-               # XXX: this is expensive; cache this info somewhere.
+               # XXX: this is expensive; cache this info somewhere.
 
-               $title = $this->mTitle;
-               $contribs = array();
-               $dbr =& wfGetDB( DB_SLAVE );
+               $title = $this->mTitle;
+               $contribs = array();
+               $dbr =& $this->getDB();
                $oldTable = $dbr->tableName( 'old' );
                $userTable = $dbr->tableName( 'user' );
-               $encDBkey = $dbr->strencode( $title->getDBkey() );
+               $encDBkey = $dbr->addQuotes( $title->getDBkey() );
                $ns = $title->getNamespace();
                $user = $this->getUser();
 
@@ -601,70 +658,67 @@ class Article {
                        WHERE old_namespace = $user
                        AND old_title = $encDBkey
                        AND old_user != $user
-                       GROUP BY old_user
+                       GROUP BY old_user, old_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 = $dbr->query($sql, $fname);
 
                while ( $line = $dbr->fetchObject( $res ) ) {
-                       $contribs[] = array($line->old_user, $line->old_user_text, $line->user_real_name);
-               }
+                       $contribs[] = array($line->old_user, $line->old_user_text, $line->user_real_name);
+               }
 
                $dbr->freeResult($res);
-
-               return $contribs;
+               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, $wgMwRedir, $wgOnlySysopsCanPatrol;
+       /**
+        * 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;
                $sk = $wgUser->getSkin();
 
                $fname = 'Article::view';
                wfProfileIn( $fname );
-
                # Get variables from query string
-               $oldid = $wgRequest->getVal( 'oldid' );
+               $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), intval($rcid) );
+                       $de = new DifferenceEngine( $oldid, $diff, $rcid );
                        $de->showDiffPage();
-                       wfProfileOut( $fname );
                        if( $diff == 0 ) {
                                # Run view updates for current revision only
                                $this->viewUpdates();
                        }
+                       wfProfileOut( $fname );
                        return;
                }
-
                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;
@@ -678,7 +732,6 @@ class Article {
                                $outputDone = true;
                        }
                }
-
                if ( !$outputDone ) {
                        $text = $this->getContent( false ); # May change mTitle by following a redirect
 
@@ -693,7 +746,7 @@ class Article {
                        # We're looking at an old revision
 
                        if ( !empty( $oldid ) ) {
-                               $this->setOldSubtitle();
+                               $this->setOldSubtitle( $oldid );
                                $wgOut->setRobotpolicy( 'noindex,follow' );
                        }
                        if ( '' != $this->mRedirectedFrom ) {
@@ -717,33 +770,37 @@ class Article {
                                $wgOut->addHTML( '<pre>'.htmlspecialchars($this->mContent)."\n</pre>" );
                        } else if ( $rt = Title::newFromRedirect( $text ) ) {
                                # Display redirect
-                               $imageUrl = "$wgStylePath/images/redirect.png";
+                               $imageUrl = $wgStylePath.'/common/images/redirect.png';
                                $targetUrl = $rt->escapeLocalURL();
                                $titleText = htmlspecialchars( $rt->getPrefixedText() );
                                $link = $sk->makeLinkObj( $rt );
-                               $wgOut->addHTML( "<img valign=\"center\" src=\"$imageUrl\">" .
-                                 "<span class=\"redirectText\">$link</span>" );
+
+                               $wgOut->addHTML( '<img valign="center" src="'.$imageUrl.'" alt="#REDIRECT" />' .
+                                 '<span class="redirectText">'.$link.'</span>' );
+
                        } else if ( $pcache ) {
                                # Display content and save to parser cache
-                               $wgOut->addWikiText( $text, true, $this );
+                               $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->getID() != 0 &&
-                    ( $wgUser->isSysop() || !$wgOnlySysopsCanPatrol ) )
+                    ( $wgUser->isAllowed('patrol') || !$wgOnlySysopsCanPatrol ) )
                {
                        $wgOut->addHTML( wfMsg ( 'markaspatrolledlink',
                                $sk->makeKnownLinkObj ( $this->mTitle, wfMsg ( 'markaspatrolledtext' ),
-                                       "action=markpatrolled&rcid={$rcid}" )
+                                       'action=markpatrolled&rcid='.$rcid )
                         ) );
                }
 
+               # Put link titles into the link cache
+               $wgOut->transformBuffer();
+
                # Add link titles as META keywords
                $wgOut->addMetaTags() ;
 
@@ -751,14 +808,15 @@ class Article {
                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.
-
-       /* private */ function insertNewArticle( $text, $summary, $isminor, $watchthis )
-       {
-               global $wgOut, $wgUser, $wgMwRedir;
+       /**
+        * 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';
@@ -768,27 +826,27 @@ 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();
                $dbw =& wfGetDB( DB_MASTER );
 
                $cur_id = $dbw->nextSequenceValue( 'cur_cur_id_seq' );
 
                $isminor = ( $isminor && $wgUser->getID() ) ? 1 : 0;
 
-               $dbw->insertArray( 'cur', array(
+               $dbw->insert( 'cur', array(
                        'cur_id' => $cur_id,
                        'cur_namespace' => $ns,
                        'cur_title' => $ttl,
                        'cur_text' => $text,
                        'cur_comment' => $summary,
                        'cur_user' => $wgUser->getID(),
-                       'cur_timestamp' => $now,
+                       'cur_timestamp' => $dbw->timestamp($now),
                        'cur_minor_edit' => $isminor,
                        'cur_counter' => 0,
                        'cur_restrictions' => '',
@@ -796,7 +854,7 @@ class Article {
                        'cur_is_redirect' => $redir,
                        'cur_is_new' => 1,
                        'cur_random' => $rand,
-                       'cur_touched' => $now,
+                       'cur_touched' => $dbw->timestamp($now),
                        'inverse_timestamp' => $won,
                ), $fname );
 
@@ -816,7 +874,8 @@ 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
-               $dbw->updateArray( 'cur', array( 'cur_touched' => $now ), array( 'cur_namespace' => $talkns, 'cur_title' => $ttl ), $fname );
+               $dbw->update( 'cur', array('cur_touched' => $dbw->timestamp($now) ),
+                       array(  'cur_namespace' => $talkns, 'cur_title' => $ttl ), $fname );
 
                # standard deferred updates
                $this->editUpdates( $text );
@@ -825,10 +884,25 @@ class Article {
        }
 
 
-       /* Side effects: loads last edit */
-       function getTextOfLastEditWithSectionReplacedOrAdded($section, $text, $summary = ''){
-               $this->loadLastEdit();
-               $oldtext = $this->getContent( true );
+       /**
+        * Side effects: loads last edit if $edittime is NULL
+        */
+       function getTextOfLastEditWithSectionReplacedOrAdded($section, $text, $summary = '', $edittime = NULL) {
+               $fname = 'Article::getTextOfLastEditWithSectionReplacedOrAdded';
+               if(is_null($edittime)) {
+                       $this->loadLastEdit();
+                       $oldtext = $this->getContent( true );
+               } else {
+                       $dbw =& wfGetDB( DB_MASTER );
+                       $ns = $this->mTitle->getNamespace();
+                       $title = $this->mTitle->getDBkey();
+                       $obj = $dbw->selectRow( 'old', 
+                               array( 'old_text','old_flags'), 
+                               array( 'old_namespace' => $ns, 'old_title' => $title, 
+                                       'old_timestamp' => $dbw->timestamp($edittime)),
+                               $fname );
+                       $oldtext = Article::getRevisionText( $obj );
+               }
                if ($section != '') {
                        if($section=='new') {
                                if($summary) $subject="== {$summary} ==\n\n";
@@ -846,7 +920,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
 
@@ -858,7 +932,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
@@ -873,7 +947,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);
@@ -901,8 +975,14 @@ class Article {
                return $text;
        }
 
-       function updateArticle( $text, $summary, $minor, $watchthis, $forceBot = false, $sectionanchor = '' )
-       {
+       /**
+        * 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;
@@ -912,9 +992,15 @@ class Article {
 
                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 ( $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; }
 
@@ -941,21 +1027,21 @@ class Article {
                        $won = wfInvertTimestamp( $now );
 
                        # First update the cur row
-                       $dbw->updateArray( 'cur',
+                       $dbw->update( 'cur',
                                array( /* SET */
                                        'cur_text' => $text,
                                        'cur_comment' => $summary,
                                        'cur_minor_edit' => $me2,
                                        'cur_user' => $wgUser->getID(),
-                                       'cur_timestamp' => $now,
+                                       'cur_timestamp' => $dbw->timestamp($now),
                                        'cur_user_text' => $wgUser->getName(),
                                        'cur_is_redirect' => $redir,
                                        'cur_is_new' => 0,
-                                       'cur_touched' => $now,
+                                       'cur_touched' => $dbw->timestamp($now),
                                        'inverse_timestamp' => $won
                                ), array( /* WHERE */
                                        'cur_id' => $this->getID(),
-                                       'cur_timestamp' => $this->getTimestamp()
+                                       'cur_timestamp' => $dbw->timestamp($this->getTimestamp())
                                ), $fname
                        );
 
@@ -968,7 +1054,7 @@ class Article {
                                # This overwrites $oldtext if revision compression is on
                                $flags = Article::compressRevisionText( $oldtext );
 
-                               $dbw->insertArray( 'old',
+                               $dbw->insert( 'old',
                                        array(
                                                'old_id' => $dbw->nextSequenceValue( 'old_old_id_seq' ),
                                                'old_namespace' => $this->mTitle->getNamespace(),
@@ -977,7 +1063,7 @@ class Article {
                                                'old_comment' => $this->getComment(),
                                                'old_user' => $this->getUser(),
                                                'old_user_text' => $this->getUserText(),
-                                               'old_timestamp' => $this->getTimestamp(),
+                                               'old_timestamp' => $dbw->timestamp($this->getTimestamp()),
                                                'old_minor_edit' => $me1,
                                                'inverse_timestamp' => wfInvertTimestamp( $this->getTimestamp() ),
                                                'old_flags' => $flags,
@@ -1036,13 +1122,12 @@ class Article {
                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 = '' )
-       {
+       /**
+        * 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;
 
                $wgLinkCache = new LinkCache();
                # Select for update
@@ -1052,41 +1137,46 @@ class Article {
                $wgLinkCache->preFill( $this->mTitle );
                $wgLinkCache->clear();
 
-               # Switch on use of link cache in the skin
-               $sk =& $wgUser->getSkin();
-               $sk->postParseLinkColour( false );
-
-               # 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 );
        }
 
-       # Validate article
-
-       function validate ()
-       {
-               global $wgOut ;
-               $wgOut->setPagetitle( wfMsg( 'validate' ) . " : " . $this->mTitle->getPrefixedText()  );
-               $wgOut->setRobotpolicy( 'noindex,follow' );
-               if ( $this->mTitle->getNamespace() != 0 )
-                       {
-                       $wgOut->addHTML ( wfMsg ( 'val_validate_article_namespace_only' ) ) ;
-                       return ;
+       /**
+        * Validate article
+        * @todo document this function a bit more
+        */
+       function validate () {
+               global $wgOut, $wgUseValidation;
+               if( $wgUseValidation ) {
+                       require_once ( 'SpecialValidate.php' ) ;
+                       $wgOut->setPagetitle( wfMsg( 'validate' ) . ': ' . $this->mTitle->getPrefixedText() );
+                       $wgOut->setRobotpolicy( 'noindex,follow' );
+                       if( $this->mTitle->getNamespace() != 0 ) {
+                               $wgOut->addHTML( wfMsg( 'val_validate_article_namespace_only' ) );
+                               return;
                        }
-               $v = new Validation ;
-               $v->validate_form ( $this->mTitle->getDBkey() ) ;
+                       $v = new Validation;
+                       $v->validate_form( $this->mTitle->getDBkey() );
+               } else {
+                       $wgOut->errorpage( 'nosuchaction', 'nosuchactiontext' );
+               }
        }
 
-       # Mark this particular edit as patrolled
-       function markpatrolled()
-       {
-               global $wgOut, $wgRequest, $wgOnlySysopsCanPatrol, $wgUseRCPatrol;
+       /**
+        * Mark this particular edit as patrolled
+        */
+       function markpatrolled() {
+               global $wgOut, $wgRequest, $wgOnlySysopsCanPatrol, $wgUseRCPatrol, $wgUser;
                $wgOut->setRobotpolicy( 'noindex,follow' );
 
                if ( !$wgUseRCPatrol )
@@ -1099,7 +1189,7 @@ class Article {
                        $wgOut->loginToUse();
                        return;
                }
-               if ( $wgOnlySysopsCanPatrol && !$wgUser->isSysop() )
+               if ( $wgOnlySysopsCanPatrol && !$wgUser->isAllowed('patrol') )
                {
                        $wgOut->sysopRequired();
                        return;
@@ -1119,10 +1209,11 @@ class Article {
        }
 
 
-       # Add this page to my watchlist
-       function watch( $add = true )
-       {
-               global $wgUser, $wgOut, $wgLang;
+       /**
+        * Add or remove this page to my watchlist based on value of $add
+        */
+       function watch( $add = true ) {
+               global $wgUser, $wgOut;
                global $wgDeferredUpdateList;
 
                if ( 0 == $wgUser->getID() ) {
@@ -1156,16 +1247,20 @@ class Article {
                $wgOut->returnToMain( true, $this->mTitle->getPrefixedText() );
        }
 
-       function unwatch()
-       {
+       /**
+        * Stop watching a page, it act just like a call to watch(false)
+        */
+       function unwatch() {
                $this->watch( false );
        }
 
-       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;
                }
@@ -1184,20 +1279,20 @@ class Article {
 
                if ( $confirm ) {
                        $dbw =& wfGetDB( DB_MASTER );
-                       $dbw->updateArray( 'cur',
+                       $dbw->update( 'cur',
                                array( /* SET */
-                                       'cur_touched' => wfTimestampNow(),
+                                       'cur_touched' => $dbw->timestamp(),
                                        'cur_restrictions' => (string)$limit
                                ), array( /* WHERE */
                                        'cur_id' => $id
                                ), 'Article::protect'
                        );
 
-                       $log = new LogPage( wfMsg( 'protectlogpage' ), wfMsg( 'protectlogtext' ) );
-                       if ( $limit === "" ) {
-                                       $log->addEntry( wfMsg( 'unprotectedarticle', $this->mTitle->getPrefixedText() ), $reason );
+                       $log = new LogPage( 'protect' );
+                       if ( $limit === '' ) {
+                                       $log->addEntry( 'unprotect', $this->mTitle, $reason );
                        } else {
-                                       $log->addEntry( wfMsg( 'protectedarticle', $this->mTitle->getPrefixedText() ), $reason );
+                                       $log->addEntry( 'protect', $this->mTitle, $reason );
                        }
                        $wgOut->redirect( $this->mTitle->getFullURL() );
                        return;
@@ -1207,9 +1302,10 @@ class Article {
                }
        }
 
-               # Output protection confirmation dialog
-       function confirmProtect( $par, $reason, $limit = 'sysop'  )
-       {
+       /**
+        * Output protection confirmation dialog
+        */
+       function confirmProtect( $par, $reason, $limit = 'sysop'  ) {
                global $wgOut;
 
                wfDebug( "Article::confirmProtect\n" );
@@ -1272,14 +1368,17 @@ class Article {
                $wgOut->returnToMain( false );
        }
 
-       function unprotect()
-       {
+       /**
+        * Unprotect the pages
+        */
+       function unprotect() {
                return $this->protect( '' );
        }
 
-       # UI entry point for page deletion
-       function delete()
-       {
+       /*
+        * UI entry point for page deletion
+        */
+       function delete() {
                global $wgUser, $wgOut, $wgMessageCache, $wgRequest;
                $fname = 'Article::delete';
                $confirm = $wgRequest->getBool( 'wpConfirm' ) && $wgRequest->wasPosted();
@@ -1288,7 +1387,7 @@ class Article {
                # This code desperately needs to be totally rewritten
 
                # Check permissions
-               if ( ( ! $wgUser->isSysop() ) ) {
+               if ( ( ! $wgUser->isAllowed('delete') ) ) {
                        $wgOut->sysopRequired();
                        return;
                }
@@ -1313,15 +1412,15 @@ 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 =& wfGetDB( DB_SLAVE );
+               $dbr =& $this->getDB();
                $ns = $this->mTitle->getNamespace();
                $title = $this->mTitle->getDBkey();
-               $old = $dbr->getArray( 'old',
+               $old = $dbr->selectRow( 'old',
                        array( 'old_text', 'old_flags' ),
                        array(
                                'old_namespace' => $ns,
                                'old_title' => $title,
-                       ), $fname, array( 'ORDER BY' => 'inverse_timestamp' )
+                       ), $fname, $this->getSelectOptions( array( 'ORDER BY' => 'inverse_timestamp' ) )
                );
 
                if( $old !== false && !$confirm ) {
@@ -1331,12 +1430,12 @@ class Article {
                }
 
                # Fetch cur_text
-               $s = $dbr->getArray( 'cur',
+               $s = $dbr->selectRow( 'cur',
                        array( 'cur_text' ),
                        array(
                                'cur_namespace' => $ns,
                                'cur_title' => $title,
-                       ), $fname
+                       ), $fname, $this->getSelectOptions()
                );
 
                if( $s !== false ) {
@@ -1344,7 +1443,7 @@ class Article {
 
                        #if this is empty, an earlier revision may contain "useful" text
                        $blanked = false;
-                       if($s->cur_text!="") {
+                       if($s->cur_text != '') {
                                $text=$s->cur_text;
                        } else {
                                if($old) {
@@ -1385,9 +1484,10 @@ class Article {
                return $this->confirmDelete( '', $reason );
        }
 
-       # Output deletion confirmation dialog
-       function confirmDelete( $par, $reason )
-       {
+       /**
+        * Output deletion confirmation dialog
+        */
+       function confirmDelete( $par, $reason ) {
                global $wgOut;
 
                wfDebug( "Article::confirmDelete\n" );
@@ -1437,12 +1537,14 @@ class Article {
                $wgOut->returnToMain( false );
        }
 
-       # Perform a deletion and output success or failure messages
-       function doDelete( $reason )
-       {
-               global $wgOut, $wgUser, $wgLang;
+
+       /**
+        * Perform a deletion and output success or failure messages
+        */
+       function doDelete( $reason ) {
+               global $wgOut, $wgUser, $wgContLang;
                $fname = 'Article::doDelete';
-               wfDebug( "$fname\n" );
+               wfDebug( $fname."\n" );
 
                if ( $this->doDeleteArticle( $reason ) ) {
                        $deleted = $this->mTitle->getPrefixedText();
@@ -1451,10 +1553,10 @@ class Article {
                        $wgOut->setRobotpolicy( 'noindex,nofollow' );
 
                        $sk = $wgUser->getSkin();
-                       $loglink = $sk->makeKnownLink( $wgLang->getNsText( NS_WIKIPEDIA ) .
-                         ':' . wfMsg( 'dellogpage' ), wfMsg( 'deletionlog' ) );
+                       $loglink = $sk->makeKnownLink( $wgContLang->getNsText( NS_PROJECT ) .
+                         ':' . wfMsgForContent( 'dellogpage' ), wfMsg( 'deletionlog' ) );
 
-                       $text = wfMsg( "deletedtext", $deleted, $loglink );
+                       $text = wfMsg( 'deletedtext', $deleted, $loglink );
 
                        $wgOut->addHTML( '<p>' . $text . "</p>\n" );
                        $wgOut->returnToMain( false );
@@ -1463,12 +1565,13 @@ class Article {
                }
        }
 
-       # 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';
@@ -1479,7 +1582,7 @@ class Article {
                $t = $this->mTitle->getDBkey();
                $id = $this->mTitle->getArticleID();
 
-               if ( '' == $t || $id == 0 ) {
+               if ( $t == '' || $id == 0 ) {
                        return false;
                }
 
@@ -1576,9 +1679,8 @@ class Article {
                $dbw->delete( 'categorylinks', array( 'cl_from' => $id ) );
 
                # Log the deletion
-               $log = new LogPage( wfMsg( 'dellogpage' ), wfMsg( 'dellogpagetext' ) );
-               $art = $this->mTitle->getPrefixedText();
-               $log->addEntry( wfMsg( 'deletedarticle', $art ), $reason );
+               $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 );
@@ -1586,12 +1688,14 @@ class Article {
                return true;
        }
 
-       function rollback()
-       {
-               global $wgUser, $wgLang, $wgOut, $wgRequest;
-               $fname = "Article::rollback";
+       /**
+        * Revert a modification
+        */
+       function rollback() {
+               global $wgUser, $wgOut, $wgRequest;
+               $fname = 'Article::rollback';
 
-               if ( ! $wgUser->isSysop() ) {
+               if ( ! $wgUser->isAllowed('rollback') ) {
                        $wgOut->sysopRequired();
                        return;
                }
@@ -1609,7 +1713,7 @@ class Article {
                $n = $this->mTitle->getNamespace();
 
                # Get the last editor, lock table exclusively
-               $s = $dbw->getArray( 'cur',
+               $s = $dbw->selectRow( 'cur',
                        array( 'cur_id','cur_user','cur_user_text','cur_comment' ),
                        array( 'cur_title' => $tt, 'cur_namespace' => $n ),
                        $fname, 'FOR UPDATE'
@@ -1639,7 +1743,7 @@ class Article {
                }
 
                # Get the last edit not by this guy
-               $s = $dbw->getArray( 'old',
+               $s = $dbw->selectRow( 'old',
                        array( 'old_text','old_user','old_user_text','old_timestamp','old_flags' ),
                        array(
                                'old_namespace' => $n,
@@ -1656,7 +1760,7 @@ class Article {
 
                if ( $bot ) {
                        # Mark all reverted edits as bot
-                       $dbw->updateArray( 'recentchanges',
+                       $dbw->update( 'recentchanges',
                                array( /* SET */
                                        'rc_bot' => 1
                                ), array( /* WHERE */
@@ -1670,17 +1774,18 @@ class Article {
                $newcomment = wfMsg( 'revertpage', $s->old_user_text, $from );
                $wgOut->setPagetitle( wfMsg( 'actioncomplete' ) );
                $wgOut->setRobotpolicy( 'noindex,nofollow' );
-               $wgOut->addHTML( '<h2>' . $newcomment . "</h2>\n<hr />\n" );
+               $wgOut->addHTML( '<h2>' . htmlspecialchars( $newcomment ) . "</h2>\n<hr />\n" );
                $this->updateArticle( Article::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;
@@ -1695,18 +1800,20 @@ class Article {
                array_push( $wgDeferredUpdateList, $u );
        }
 
-       # Do standard deferred updates after page edit.
-       # Every 1000th edit, prune the recent changes table.
-
-       /* 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 ) {
                global $wgDeferredUpdateList, $wgDBname, $wgMemc;
                global $wgMessageCache;
 
                wfSeedRandom();
                if ( 0 == mt_rand( 0, 999 ) ) {
                        $dbw =& wfGetDB( DB_MASTER );
-                       $cutoff = wfUnix2Timestamp( time() - ( 7 * 86400 ) );
+                       $cutoff = $dbw->timestamp( time() - ( 7 * 86400 ) );
                        $sql = "DELETE FROM recentchanges WHERE rc_timestamp < '{$cutoff}'";
                        $dbw->query( $sql );
                }
@@ -1733,29 +1840,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 ) {
@@ -1784,7 +1903,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' ) );
@@ -1803,25 +1926,33 @@ 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();
-               $dbr =& wfGetDB( DB_SLAVE );
-               $s = $dbr->getArray( 'cur', array( 'cur_touched', 'cur_is_redirect' ),
-                       array( 'cur_id' => $id ), $fname );
+               $dbr =& $this->getDB();
+               $s = $dbr->selectRow( 'cur', array( 'cur_touched', 'cur_is_redirect' ),
+                       array( 'cur_id' => $id ), $fname, $this->getSelectOptions() );
                if( $s !== false ) {
-                       $this->mTouched = $s->cur_touched;
+                       $this->mTouched = wfTimestamp(TS_MW,$s->cur_touched);
                        return !$s->cur_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;
+               global $wgUser;
                $fname = 'Article::quickEdit';
                wfProfileIn( $fname );
 
@@ -1859,28 +1990,33 @@ class Article {
                        'cur_user_text' => $wgUser->getName(),
                        'inverse_timestamp' => wfInvertTimestamp( $timestamp ),
                        'cur_comment' => $comment,
-                       'cur_is_redirect' => $wgMwRedir->matchStart( $text ) ? 1 : 0,
+                       'cur_is_redirect' => $this->isRedirect( $text ) ? 1 : 0,
                        'cur_minor_edit' => intval($minor),
-                       'cur_touched' => $timestamp,
+                       'cur_touched' => $dbw->timestamp($timestamp),
                );
 
                if ( $numRows ) {
                        # Update article
                        $fields['cur_is_new'] = 0;
-                       $dbw->updateArray( 'cur', $fields, array( 'cur_namespace' => $ns, 'cur_title' => $dbkey ), $fname );
+                       $dbw->update( '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, '.', '' );
-                       $dbw->insertArray( 'cur', $fields, $fname );
+                       $fields['cur_random'] = $rand = wfRandom();
+                       $dbw->insert( 'cur', $fields, $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;
 
@@ -1929,14 +2065,19 @@ class Article {
                $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();
@@ -1955,27 +2096,27 @@ 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
-
-       function info()
-       {
-               global $wgUser, $wgTitle, $wgOut, $wgLang, $wgAllowPageInfo;
+       /**
+        * Info about this page
+        */
+       function info() {
+               global $wgUser, $wgTitle, $wgOut, $wgAllowPageInfo;
                $fname = 'Article::info';
 
                if ( !$wgAllowPageInfo ) {
-                       $wgOut->errorpage( "nosuchaction", "nosuchactiontext" );
+                       $wgOut->errorpage( 'nosuchaction', 'nosuchactiontext' );
                        return;
                }
 
-               $dbr =& wfGetDB( DB_SLAVE );
+               $dbr =& $this->getDB();
 
                $basenamespace = $wgTitle->getNamespace() & (~1);
                $cur_clause = array( 'cur_title' => $wgTitle->getDBkey(), 'cur_namespace' => $basenamespace );
@@ -1983,17 +2124,18 @@ class Article {
                $wl_clause  = array( 'wl_title' => $wgTitle->getDBkey(), 'wl_namespace' => $basenamespace );
                $fullTitle = $wgTitle->makeName($basenamespace, $wgTitle->getDBKey());
                $wgOut->setPagetitle(  $fullTitle );
-               $wgOut->setSubtitle( wfMsg( "infosubtitle" ));
+               $wgOut->setSubtitle( wfMsg( 'infosubtitle' ));
 
                # first, see if the page exists at all.
-               $exists = $dbr->selectField( 'cur', 'COUNT(*)', $cur_clause, $fname );
+               $exists = $dbr->selectField( 'cur', 'COUNT(*)', $cur_clause, $fname, $this->getSelectOptions() );
                if ($exists < 1) {
-                       $wgOut->addHTML( wfMsg("noarticletext") );
+                       $wgOut->addHTML( wfMsg('noarticletext') );
                } else {
-                       $numwatchers = $dbr->selectField( 'watchlist', 'COUNT(*)', $wl_clause, $fname );
-                       $wgOut->addHTML( "<ul><li>" . wfMsg("numwatchers", $numwatchers) . "</li>" );
-                       $old = $dbr->selectField( 'old', 'COUNT(*)', $old_clause, $fname );
-                       $wgOut->addHTML( "<li>" . wfMsg("numedits", $old + 1) . "</li>");
+                       $numwatchers = $dbr->selectField( 'watchlist', 'COUNT(*)', $wl_clause, $fname,
+                               $this->getSelectOptions() );
+                       $wgOut->addHTML( "<ul><li>" . wfMsg("numwatchers", $numwatchers) . '</li>' );
+                       $old = $dbr->selectField( 'old', 'COUNT(*)', $old_clause, $fname, $this->getSelectOptions() );
+                       $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:
@@ -2001,33 +2143,37 @@ class Article {
                        # - then, find the number of *other* authors in 'old'
 
                        # find 'cur' author
-                       $cur_author = $dbr->selectField( 'cur', 'cur_user_text', $cur_clause, $fname );
+                       $cur_author = $dbr->selectField( 'cur', 'cur_user_text', $cur_clause, $fname,
+                               $this->getSelectOptions() );
 
                        # find number of 'old' authors excluding 'cur' author
                        $authors = $dbr->selectField( 'old', 'COUNT(DISTINCT old_user_text)',
-                               $old_clause + array( 'old_user_text<>' . $dbr->addQuotes( $cur_author ) ), $fname ) + 1;
+                               $old_clause + array( 'old_user_text<>' . $dbr->addQuotes( $cur_author ) ), $fname,
+                               $this->getSelectOptions() ) + 1;
 
                        # now for the Talk page ...
                        $cur_clause = array( 'cur_title' => $wgTitle->getDBkey(), 'cur_namespace' => $basenamespace+1 );
                        $old_clause = array( 'old_title' => $wgTitle->getDBkey(), 'old_namespace' => $basenamespace+1 );
 
                        # does it exist?
-                       $exists = $dbr->selectField( 'cur', 'COUNT(*)', $cur_clause, $fname );
+                       $exists = $dbr->selectField( 'cur', 'COUNT(*)', $cur_clause, $fname, $this->getSelectOptions() );
 
                        # number of edits
                        if ($exists > 0) {
-                               $old = $dbr->selectField( 'old', 'COUNT(*)', $old_clause, $fname );
-                               $wgOut->addHTML( "<li>" . wfMsg("numtalkedits", $old + 1) . "</li>");
+                               $old = $dbr->selectField( 'old', 'COUNT(*)', $old_clause, $fname, $this->getSelectOptions() );
+                               $wgOut->addHTML( '<li>' . wfMsg("numtalkedits", $old + 1) . '</li>');
                        }
-                       $wgOut->addHTML( "<li>" . wfMsg("numauthors", $authors) . "</li>" );
+                       $wgOut->addHTML( '<li>' . wfMsg("numauthors", $authors) . '</li>' );
 
                        # number of authors
                        if ($exists > 0) {
-                               $cur_author = $dbr->selectField( 'cur', 'cur_user_text', $cur_clause, $fname );
+                               $cur_author = $dbr->selectField( 'cur', 'cur_user_text', $cur_clause, $fname,
+                                       $this->getSelectOptions() );
                                $authors = $dbr->selectField( 'cur', 'COUNT(DISTINCT old_user_text)',
-                                       $old_clause + array( 'old_user_text<>' . $dbr->addQuotes( $cur_author ) ), $fname );
+                                       $old_clause + array( 'old_user_text<>' . $dbr->addQuotes( $cur_author ) ),
+                                       $fname, $this->getSelectOptions() );
 
-                               $wgOut->addHTML( "<li>" . wfMsg("numtalkauthors", $authors) . "</li></ul>" );
+                               $wgOut->addHTML( '<li>' . wfMsg('numtalkauthors', $authors) . '</li></ul>' );
                        }
                }
        }