* Replace wfMungeToUtf8 and do_html_entity_decode with a single function
[lhc/web/wiklou.git] / includes / Title.php
index 167d406..b32424f 100644 (file)
@@ -1,11 +1,10 @@
 <?php
 /**
- * See title.doc
+ * See title.txt
  * 
  * @package MediaWiki
  */
 
-/** */
 require_once( 'normal/UtfNormal.php' );
 
 $wgTitleInterwikiCache = array();
@@ -48,6 +47,7 @@ class Title {
        var $mPrefixedText;       # Text form including namespace/interwiki, initialised on demand
        var $mDefaultNamespace;   # Namespace index when there is no namespace
                               # Zero except in {{transclusion}} tags
+       var $mWatched;            # Is $wgUser watching this page? NULL if unfilled, accessed through userIsWatching()
        /**#@-*/
        
 
@@ -59,12 +59,13 @@ class Title {
                $this->mInterwiki = $this->mUrlform =
                $this->mTextform = $this->mDbkeyform = '';
                $this->mArticleID = -1;
-               $this->mNamespace = 0;
+               $this->mNamespace = NS_MAIN;
                $this->mRestrictionsLoaded = false;
                $this->mRestrictions = array();
                # Dont change the following, NS_MAIN is hardcoded in several place
                # See bug #696
                $this->mDefaultNamespace = NS_MAIN;
+               $this->mWatched = NULL;
        }
 
        /**
@@ -98,10 +99,14 @@ class Title {
         * @static
         * @access public
         */
-       /* static */ function &newFromText( $text, $defaultNamespace = 0 ) {    
+       function &newFromText( $text, $defaultNamespace = NS_MAIN ) {   
                $fname = 'Title::newFromText';
                wfProfileIn( $fname );
                
+               if( is_object( $text ) ) {
+                       wfDebugDieBacktrace( 'Title::newFromText given an object' );
+               }
+               
                /**
                 * Wiki pages often contain multiple links to the same page.
                 * Title normalization and parsing can become expensive on
@@ -111,32 +116,22 @@ class Title {
                 * In theory these are value objects and won't get changed...
                 */
                static $titleCache = array();
-               if( $defaultNamespace == 0 && isset( $titleCache[$text] ) ) {
+               if( $defaultNamespace == NS_MAIN && isset( $titleCache[$text] ) ) {
                        wfProfileOut( $fname );
                        return $titleCache[$text];
                }
 
                /**
-                * Convert things like &eacute; into real text...
-                */
-               global $wgInputEncoding;
-               $filteredText = do_html_entity_decode( $text, ENT_COMPAT, $wgInputEncoding );
-
-               /**
-                * Convert things like &#257; or &#x3017; into real text...
-                * WARNING: Not friendly to internal links on a latin-1 wiki.
+                * Convert things like &eacute; &#257; or &#x3017; into real text...
                 */
-               $filteredText = wfMungeToUtf8( $filteredText );
-               
-               # What was this for? TS 2004-03-03
-               # $text = urldecode( $text );
+               $filteredText = Sanitizer::decodeCharReferences( $text );
 
                $t =& new Title();
                $t->mDbkeyform = str_replace( ' ', '_', $filteredText );
                $t->mDefaultNamespace = $defaultNamespace;
 
                if( $t->secureAndSplit() ) {
-                       if( $defaultNamespace == 0 ) {
+                       if( $defaultNamespace == NS_MAIN ) {
                                if( count( $titleCache ) >= MW_TITLECACHE_MAX ) {
                                        # Avoid memory leaks on mass operations...
                                        $titleCache = array();
@@ -159,7 +154,7 @@ class Title {
         * @static
         * @access public
         */
-       /* static */ function newFromURL( $url ) {
+       function newFromURL( $url ) {
                global $wgLang, $wgServer;
                $t = new Title();
                
@@ -178,13 +173,16 @@ class Title {
        
        /**
         * Create a new Title from an article ID
+        *
         * @todo This is inefficiently implemented, the page row is requested
-        * but not used for anything else
+        *       but not used for anything else
+        *
         * @param int $id the page_id corresponding to the Title to create
         * @return Title the new object, or NULL on an error
         * @access public
+        * @static
         */
-       /* static */ function newFromID( $id ) {
+       function newFromID( $id ) {
                $fname = 'Title::newFromID';
                $dbr =& wfGetDB( DB_SLAVE );
                $row = $dbr->selectRow( 'page', array( 'page_namespace', 'page_title' ), 
@@ -210,7 +208,7 @@ class Title {
         * @static
         * @access public
         */
-       /* static */ function &makeTitle( $ns, $title ) {
+       function &makeTitle( $ns, $title ) {
                $t =& new Title();
                $t->mInterwiki = '';
                $t->mFragment = '';
@@ -226,13 +224,14 @@ class Title {
         * Create a new Title frrom a namespace index and a DB key.
         * The parameters will be checked for validity, which is a bit slower
         * than makeTitle() but safer for user-provided data.
+        *
         * @param int $ns the namespace of the article
         * @param string $title the database key form
         * @return Title the new object, or NULL on an error
         * @static
         * @access public
         */
-       /* static */ function makeTitleSafe( $ns, $title ) {
+       function makeTitleSafe( $ns, $title ) {
                $t = new Title();
                $t->mDbkeyform = Title::makeName( $ns, $title );
                if( $t->secureAndSplit() ) {
@@ -244,11 +243,12 @@ class Title {
 
        /**
         * Create a new Title for the Main Page
+        *
         * @static
         * @return Title the new object
         * @access public
         */
-       /* static */ function newMainPage() {
+       function newMainPage() {
                return Title::newFromText( wfMsgForContent( 'mainpage' ) );
        }
 
@@ -260,11 +260,11 @@ class Title {
         * @static
         * @access public
         */
-       /* static */ function newFromRedirect( $text ) {
+       function newFromRedirect( $text ) {
                global $wgMwRedir;
                $rt = NULL;
                if ( $wgMwRedir->matchStart( $text ) ) {
-                       if ( preg_match( '/\\[\\[([^\\]\\|]+)[\\]\\|]/', $text, $m ) ) {
+                       if ( preg_match( '/\[{2}(.*?)(?:\||\]{2})/', $text, $m ) ) {
                                # categories are escaped using : for example one can enter:
                                # #REDIRECT [[:Category:Music]]. Need to remove it.
                                if ( substr($m[1],0,1) == ':') {
@@ -294,7 +294,7 @@ class Title {
         * @static
         * @access public
         */
-       /* static */ function nameOf( $id ) {
+       function nameOf( $id ) {
                $fname = 'Title::nameOf';
                $dbr =& wfGetDB( DB_SLAVE );
                
@@ -372,8 +372,7 @@ class Title {
                global $wgContLang;
 
                $n = $wgContLang->getNsText( $ns );
-               if ( '' == $n ) { return $title; }
-               else { return $n.':'.$title; }
+               return $n == '' ? $title : "$n:$title";
        }
        
        /**
@@ -458,7 +457,7 @@ class Title {
         * @static
         * @access public
         */
-       /* static */ function touchArray( $titles, $timestamp = '' ) {
+       function touchArray( $titles, $timestamp = '' ) {
                if ( count( $titles ) == 0 ) {
                        return;
                }
@@ -612,26 +611,95 @@ class Title {
         * @access public
         */
        function getFullURL( $query = '' ) {
-               global $wgContLang, $wgArticlePath, $wgServer, $wgScript;
+               global $wgContLang, $wgServer, $wgScript, $wgMakeDumpLinks, $wgArticlePath;
 
                if ( '' == $this->mInterwiki ) {
-                       $p = $wgArticlePath;
                        return $wgServer . $this->getLocalUrl( $query );
-               } else {
+               } elseif ( $wgMakeDumpLinks && $wgContLang->getLanguageName( $this->mInterwiki ) ) {
+                       $baseUrl = str_replace( '$1', "../../{$this->mInterwiki}/$1", $wgArticlePath );
+                       $baseUrl = str_replace( '$1', $this->getHashedDirectory() . '/$1', $baseUrl );
+               } else {        
                        $baseUrl = $this->getInterwikiLink( $this->mInterwiki );
-                       $namespace = $wgContLang->getNsText( $this->mNamespace );
-                       if ( '' != $namespace ) {
-                               # Can this actually happen? Interwikis shouldn't be parsed.
-                               $namepace .= ':';
+               }
+               
+               $namespace = $wgContLang->getNsText( $this->mNamespace );
+               if ( '' != $namespace ) {
+                       # Can this actually happen? Interwikis shouldn't be parsed.
+                       $namepace .= ':';
+               }
+               $url = str_replace( '$1', $namespace . $this->mUrlform, $baseUrl );
+               if( $query != '' ) {
+                       if( false === strpos( $url, '?' ) ) {
+                               $url .= '?';
+                       } else {
+                               $url .= '&';
                        }
-                       $url = str_replace( '$1', $namespace . $this->mUrlform, $baseUrl );
-                       if ( '' != $this->mFragment ) {
-                               $url .= '#' . $this->mFragment;
+                       $url .= $query;
+               }
+               if ( '' != $this->mFragment ) {
+                       $url .= '#' . $this->mFragment;
+               }
+               return $url;
+       }
+
+       /** 
+        * Get a relative directory for putting an HTML version of this article into
+        */
+       function getHashedDirectory() {
+               global $wgMakeDumpLinks, $wgInputEncoding;
+               $dbkey = $this->getDBkey();
+
+               # Split into characters
+               if ( $wgInputEncoding == 'UTF-8' ) {
+                       preg_match_all( '/./us', $dbkey, $m );
+               } else {
+                       preg_match_all( '/./s', $dbkey, $m );
+               }
+               $chars = $m[0];
+               $length = count( $chars );              
+               $dir = '';
+
+               for ( $i = 0; $i < $wgMakeDumpLinks; $i++ ) {
+                       if ( $i ) {
+                               $dir .= '/';
+                       }
+                       if ( $i >= $length ) { 
+                               $dir .= '_';
+                       } elseif ( ord( $chars[$i] ) > 32 ) {
+                               $dir .= strtolower( $chars[$i] );
+                       } else {
+                               $dir .= sprintf( "%02X", ord( $chars[$i] ) );
                        }
-                       return $url;
                }
+               return $dir;
        }
+       
+       function getHashedFilename() {
+               $dbkey = $this->getPrefixedDBkey();
+               $mainPage = Title::newMainPage();
+               if ( $mainPage->getPrefixedDBkey() == $dbkey ) {
+                       return 'index.html';
+               }
+
+               $dir = $this->getHashedDirectory();
 
+               # Replace illegal charcters for Windows paths with underscores
+               $friendlyName = strtr( $dbkey, '/\\*?"<>|~', '_________' );
+
+               # Work out lower case form. We assume we're on a system with case-insensitive
+               # filenames, so unless the case is of a special form, we have to disambiguate
+               $lowerCase = $this->prefix( ucfirst( strtolower( $this->getDBkey() ) ) );
+
+               # Make it mostly unique
+               if ( $lowerCase != $friendlyName  ) {
+                       $friendlyName .= '_' . substr(md5( $dbkey ), 0, 4);
+               }
+               # Handle colon specially by replacing it with tilde
+               # Thus we reduce the number of paths with hashes appended
+               $friendlyName = str_replace( ':', '~', $friendlyName );
+               return "$dir/$friendlyName.html";       
+       }
+       
        /**
         * Get a URL with no fragment or server name
         * @param string $query an optional query string; if not specified,
@@ -640,16 +708,29 @@ class Title {
         * @access public
         */
        function getLocalURL( $query = '' ) {
-               global $wgLang, $wgArticlePath, $wgScript;
+               global $wgLang, $wgArticlePath, $wgScript, $wgMakeDumpLinks;
                
                if ( $this->isExternal() ) {
                        return $this->getFullURL();
                }
-
+               
                $dbkey = wfUrlencode( $this->getPrefixedDBkey() );
-               if ( $query == '' ) {
+               if ( $wgMakeDumpLinks ) {
+                       $url = str_replace( '$1', wfUrlencode( $this->getHashedFilename() ), $wgArticlePath );
+               } elseif ( $query == '' ) {
                        $url = str_replace( '$1', $dbkey, $wgArticlePath );
                } else {
+                       if( preg_match( '/^(.*&|)action=([^&]*)(&(.*)|)$/', $query, $matches ) ) {
+                               global $wgActionPaths;
+                               $action = urldecode( $matches[2] );
+                               if( isset( $wgActionPaths[$action] ) ) {
+                                       $query = $matches[1];
+                                       if( isset( $matches[4] ) ) $query .= $matches[4];
+                                       $url = str_replace( '$1', $dbkey, $wgActionPaths[$action] );
+                                       if( $query != '' ) $url .= '?' . $query;
+                                       return $url;
+                               }
+                       }
                        if ( $query == '-' ) {
                                $query = '';
                        }
@@ -755,10 +836,14 @@ class Title {
        function userIsWatching() {
                global $wgUser;
 
-               if ( -1 == $this->mNamespace ) { return false; }
-               if ( 0 == $wgUser->getID() ) { return false; }
-
-               return $wgUser->isWatched( $this );
+               if ( is_null( $this->mWatched ) ) {
+                       if ( -1 == $this->mNamespace || 0 == $wgUser->getID()) {
+                               $this->mWatched = false;
+                       } else {
+                               $this->mWatched = $wgUser->isWatched( $this );
+                       }
+               }
+               return $this->mWatched;
        }
 
        /**
@@ -770,7 +855,7 @@ class Title {
        function userCan($action) {
                $fname = 'Title::userCanEdit';
                wfProfileIn( $fname );
-               
+
                global $wgUser;
                if( NS_SPECIAL == $this->mNamespace ) {
                        wfProfileOut( $fname );
@@ -807,11 +892,21 @@ class Title {
                }
 
                foreach( $this->getRestrictions($action) as $right ) {
+                       // Backwards compatibility, rewrite sysop -> protect
+                       if ( $right == 'sysop' ) {
+                               $right = 'protect';
+                       }
                        if( '' != $right && !$wgUser->isAllowed( $right ) ) {
                                wfProfileOut( $fname );
                                return false;
                        }
                }
+               
+               if( $action == 'move' && !$this->isMovable() ) {
+                       wfProfileOut( $fname );
+                       return false;
+               }
+               
                wfProfileOut( $fname );
                return true;
        }
@@ -834,6 +929,18 @@ class Title {
                return $this->userCan('move');
        }
 
+       /**
+        * Would anybody with sufficient privileges be able to move this page?
+        * Some pages just aren't movable.
+        *
+        * @return boolean
+        * @access public
+        */
+       function isMovable() {
+               return Namespace::isMovable( $this->getNamespace() )
+                       && $this->getInterwiki() == '';
+       }
+       
        /**
         * Can $wgUser read this page?
         * @return boolean
@@ -857,12 +964,12 @@ class Title {
 
                        /** some pages are explicitly allowed */
                        $name = $this->getPrefixedText();
-                       if( in_array( $name, $wgWhitelistRead ) ) {
+                       if( $wgWhitelistRead && in_array( $name, $wgWhitelistRead ) ) {
                                return true;
                        }
                        
                        # Compatibility with old settings
-                       if( $this->getNamespace() == NS_MAIN ) {
+                       if( $wgWhitelistRead && $this->getNamespace() == NS_MAIN ) {
                                if( in_array( ':' . $name, $wgWhitelistRead ) ) {
                                        return true;
                                }
@@ -870,6 +977,15 @@ class Title {
                }
                return false;
        }
+       
+       /**
+        * Is this a talk page of some sort?
+        * @return bool
+        * @access public
+        */
+       function isTalkPage() {
+               return Namespace::isTalk( $this->getNamespace() );
+       }
 
        /**
         * Is this a .css or .js subpage of a user page?
@@ -1011,6 +1127,10 @@ class Title {
         * @access public
         */
        function invalidateCache() {
+               if ( wfReadOnly() ) {
+                       return;
+               }
+
                $now = wfTimestampNow();
                $dbw =& wfGetDB( DB_MASTER );
                $success = $dbw->update( 'page', 
@@ -1073,7 +1193,7 @@ class Title {
 
                # Clean up whitespace
                #
-               $t = preg_replace( '/[\\s_]+/', '_', $this->mDbkeyform );
+               $t = preg_replace( '/[ _]+/', '_', $this->mDbkeyform );
                $t = trim( $t, '_' );
 
                if ( '' == $t ) {
@@ -1081,8 +1201,7 @@ class Title {
                        return false;
                }
                
-               global $wgUseLatin1;
-               if( !$wgUseLatin1 && false !== strpos( $t, UTF8_REPLACEMENT ) ) {
+               if( false !== strpos( $t, UTF8_REPLACEMENT ) ) {
                        # Contained illegal UTF-8 sequences or forbidden Unicode chars.
                        wfProfileOut( $fname );
                        return false;
@@ -1182,6 +1301,7 @@ class Title {
                # We shouldn't need to query the DB for the size.
                #$maxSize = $dbr->textFieldSize( 'page', 'page_title' );
                if ( strlen( $r ) > 255 ) {
+                       wfProfileOut( $fname );
                        return false;
                }
 
@@ -1199,6 +1319,18 @@ class Title {
                        $t = $r;
                }
                
+               /**
+                * Can't make a link to a namespace alone...
+                * "empty" local links can only be self-links
+                * with a fragment identifier.
+                */
+               if( $t == '' &&
+                       $this->mInterwiki == '' &&
+                       $this->mNamespace != NS_MAIN ) {
+                       wfProfileOut( $fname );
+                       return false;
+               }
+               
                # Fill fields
                $this->mDbkeyform = $t;
                $this->mUrlform = wfUrlencode( $t );
@@ -1231,7 +1363,7 @@ class Title {
 
        /**
         * Get an array of Title objects linking to this Title
-        * Also stores the IDs in the link cache.
+        * Also stores the IDs in the link cache.
         *
         * @param string $options may be FOR UPDATE 
         * @return array the Title objects linking here
@@ -1246,16 +1378,21 @@ class Title {
                } else {
                        $db =& wfGetDB( DB_SLAVE );
                }
-               $page = $db->tableName( 'page' );
-               $links = $db->tableName( 'links' );
-
-               $sql = "SELECT page_namespace,page_title,page_id FROM $page,$links WHERE l_from=page_id AND l_to={$id} $options";
-               $res = $db->query( $sql, 'Title::getLinksTo' );
+               
+               $res = $db->select( array( 'page', 'pagelinks' ),
+                       array( 'page_namespace', 'page_title', 'page_id' ),
+                       array(
+                               'pl_from=page_id',
+                               'pl_namespace' => $this->getNamespace(),
+                               'pl_title'     => $this->getDbKey() ),
+                       'Title::getLinksTo',
+                       $options );
+               
                $retVal = array();
                if ( $db->numRows( $res ) ) {
                        while ( $row = $db->fetchObject( $res ) ) {
                                if ( $titleObj = Title::makeTitle( $row->page_namespace, $row->page_title ) ) {
-                                       $wgLinkCache->addGoodLink( $row->page_id, $titleObj->getPrefixedDBkey() );
+                                       $wgLinkCache->addGoodLinkObj( $row->page_id, $titleObj );
                                        $retVal[] = $titleObj;
                                }
                        }
@@ -1265,14 +1402,13 @@ class Title {
        }
 
        /**
-        * Get an array of Title objects linking to this non-existent title.
-        * - Also stores the IDs in the link cache.
+        * Get an array of Title objects referring to non-existent articles linked from this page
         *
         * @param string $options may be FOR UPDATE 
-        * @return array the Title objects linking here
+        * @return array the Title objects
         * @access public
         */
-       function getBrokenLinksTo( $options = '' ) {
+       function getBrokenLinksFrom( $options = '' ) {
                global $wgLinkCache;
                
                if ( $options ) {
@@ -1280,25 +1416,32 @@ class Title {
                } else {
                        $db =& wfGetDB( DB_SLAVE );
                }
-               $page = $db->tableName( 'page' );
-               $brokenlinks = $db->tableName( 'brokenlinks' );
-               $encTitle = $db->strencode( $this->getPrefixedDBkey() );
-
-               $sql = "SELECT page_namespace,page_title,page_id FROM $brokenlinks,$page " .
-                 "WHERE bl_from=page_id AND bl_to='$encTitle' $options";
-               $res = $db->query( $sql, "Title::getBrokenLinksTo" );
+               
+               $res = $db->safeQuery(
+                         "SELECT pl_namespace, pl_title
+                            FROM !
+                       LEFT JOIN !
+                              ON pl_namespace=page_namespace
+                             AND pl_title=page_title
+                           WHERE pl_from=?
+                             AND page_namespace IS NULL
+                                 !",
+                       $db->tableName( 'pagelinks' ),
+                       $db->tableName( 'page' ),
+                       $this->getArticleId(),
+                       $options );
+               
                $retVal = array();
                if ( $db->numRows( $res ) ) {
                        while ( $row = $db->fetchObject( $res ) ) {
-                               $titleObj = Title::makeTitle( $row->page_namespace, $row->page_title );
-                               $wgLinkCache->addGoodLink( $row->page_id, $titleObj->getPrefixedDBkey() );
-                               $retVal[] = $titleObj;
+                               $retVal[] = Title::makeTitle( $row->pl_namespace, $row->pl_title );
                        }
                }
                $db->freeResult( $res );
                return $retVal;
        }
 
+
        /**
         * Get a list of URLs to purge from the Squid cache when this
         * page changes
@@ -1323,17 +1466,26 @@ class Title {
        }
        
        /**
-        * Move a title to a new location
+        * Check whether a given move operation would be valid.
+        * Returns true if ok, or a message key string for an error message
+        * if invalid. (Scarrrrry ugly interface this.)
         * @param Title &$nt the new title
         * @param bool $auth indicates whether $wgUser's permissions
         *      should be checked
         * @return mixed true on success, message name on failure
         * @access public
         */
-       function moveTo( &$nt, $auth = true ) {
+       function isValidMoveOperation( &$nt, $auth = true, $reason = '' ) {
+               global $wgUser;
                if( !$this or !$nt ) {
                        return 'badtitletext';
                }
+               if( $this->equals( $nt ) ) {
+                       return 'selfmove';
+               }
+               if( !$this->isMovable() || !$nt->isMovable() ) {
+                       return 'immobile_namespace';
+               }
 
                $fname = 'Title::move';
                $oldid = $this->getArticleID();
@@ -1342,13 +1494,9 @@ class Title {
                if ( strlen( $nt->getDBkey() ) < 1 ) {
                        return 'articleexists';
                }
-               if ( ( ! Namespace::isMovable( $this->getNamespace() ) ) ||
-                        ( '' == $this->getDBkey() ) ||
-                        ( '' != $this->getInterwiki() ) ||
+               if ( ( '' == $this->getDBkey() ) ||
                         ( !$oldid ) ||
-                    ( ! Namespace::isMovable( $nt->getNamespace() ) ) ||
-                        ( '' == $nt->getDBkey() ) ||
-                        ( '' != $nt->getInterwiki() ) ) {
+                    ( '' == $nt->getDBkey() ) ) {
                        return 'badarticleerror';
                }
 
@@ -1366,9 +1514,27 @@ class Title {
                        if ( ! $this->isValidMoveTarget( $nt ) ) {
                                return 'articleexists';
                        }
-                       $this->moveOverExistingRedirect( $nt );
+               }
+               return true;
+       }
+       
+       /**
+        * Move a title to a new location
+        * @param Title &$nt the new title
+        * @param bool $auth indicates whether $wgUser's permissions
+        *      should be checked
+        * @return mixed true on success, message name on failure
+        * @access public
+        */
+       function moveTo( &$nt, $auth = true, $reason = '' ) {
+               $err = $this->isValidMoveOperation( $nt, $auth, $reason );
+               if( is_string( $err ) ) {
+                       return $err;
+               }
+               if( $nt->exists() ) {
+                       $this->moveOverExistingRedirect( $nt, $reason );
                } else { # Target didn't exist, do normal move.
-                       $this->moveToNewTitle( $nt, $newid );
+                       $this->moveToNewTitle( $nt, $newid, $reason );
                }
 
                # Fixing category links (those without piped 'alternate' names) to be sorted under the new title
@@ -1397,6 +1563,7 @@ class Title {
                $u = new SearchUpdate( $newid, $this->getPrefixedDBkey(), '' );
                $u->doUpdate();
 
+               wfRunHooks( 'TitleMoveComplete', array(&$this, &$nt, &$wgUser, $oldid, $newid) );
                return true;
        }
        
@@ -1408,13 +1575,16 @@ class Title {
         *      be a redirect
         * @access private
         */
-       /* private */ function moveOverExistingRedirect( &$nt ) {
+       function moveOverExistingRedirect( &$nt, $reason = '' ) {
                global $wgUser, $wgLinkCache, $wgUseSquid, $wgMwRedir;
                $fname = 'Title::moveOverExistingRedirect';
                $comment = wfMsgForContent( '1movedto2', $this->getPrefixedText(), $nt->getPrefixedText() );
+
+               if ( $reason ) {
+                       $comment .= ": $reason";
+               }
                
                $now = wfTimestampNow();
-               $won = wfInvertTimestamp( $now );
                $rand = wfRandom();
                $newid = $nt->getArticleID();
                $oldid = $this->getArticleID();
@@ -1427,12 +1597,19 @@ class Title {
                # a conflict on the unique namespace+title index...
                $dbw->delete( 'page', array( 'page_id' => $newid ), $fname );
                
+               # Save a null revision in the page's history notifying of the move
+               $nullRevision = Revision::newNullRevision( $dbw, $oldid,
+                       wfMsg( '1movedto2', $this->getPrefixedText(), $nt->getPrefixedText() ),
+                       true );
+               $nullRevId = $nullRevision->insertOn( $dbw );
+               
                # Change the name of the target page:
                $dbw->update( 'page',
                        /* SET */ array( 
-                               'page_touched' => $dbw->timestamp($now), 
+                               'page_touched'   => $dbw->timestamp($now), 
                                'page_namespace' => $nt->getNamespace(),
-                               'page_title' => $nt->getDBkey()
+                               'page_title'     => $nt->getDBkey(),
+                               'page_latest'    => $nullRevId,
                        ), 
                        /* WHERE */ array( 'page_id' => $oldid ),
                        $fname
@@ -1441,84 +1618,29 @@ class Title {
 
                # Recreate the redirect, this time in the other direction.
                $redirectText = $wgMwRedir->getSynonym( 0 ) . ' [[' . $nt->getPrefixedText() . "]]\n";
-               $dbw->insert( 'revision', array(
-                       'rev_id' => $dbw->nextSequenceValue('rev_rev_id_seq'),
-                       'rev_comment' => $comment,
-                       'rev_user' => $wgUser->getID(),
-                       'rev_user_text' => $wgUser->getName(),
-                       'rev_timestamp' => $now,
-                       'inverse_timestamp' => $won ), $fname
-               );
-               $revid = $dbw->insertId();
-               $dbw->insert( 'text', array(
-                       'old_id' => $revid,
-                       'old_flags' => '',
-                       'old_text' => $redirectText,
-                       ), $fname
-               );
-               $dbw->insert( 'page', array(
-                       'page_id' => $dbw->nextSequenceValue('page_page_id_seq'),
-                       'page_namespace' => $this->getNamespace(),
-                       'page_title' => $this->getDBkey(),
-                       'page_touched' => $now,
-                       'page_is_redirect' => 1,
-                       'page_random' => $rand,
-                       'page_is_new' => 1,
-                       'page_latest' => $revid), $fname
-               );
-               $newid = $dbw->insertId();
+               $redirectArticle = new Article( $this );
+               $newid = $redirectArticle->insertOn( $dbw );
+               $redirectRevision = new Revision( array(
+                       'page'    => $newid, 
+                       'comment' => $comment,
+                       'text'    => $redirectText ) );
+               $revid = $redirectRevision->insertOn( $dbw );
+               $redirectArticle->updateRevisionOn( $dbw, $redirectRevision, 0 );
                $wgLinkCache->clearLink( $this->getPrefixedDBkey() );
-               
-               RecentChange::notifyMoveOverRedirect( $now, $this, $nt, $wgUser, $comment );
 
-               # Swap links
-               
-               # Load titles and IDs
-               $linksToOld = $this->getLinksTo( 'FOR UPDATE' );
-               $linksToNew = $nt->getLinksTo( 'FOR UPDATE' );
+               # Log the move
+               $log = new LogPage( 'move' );
+               $log->addEntry( 'move_redir', $this, $reason, array( 1 => $nt->getPrefixedText() ) );
                
-               # Delete them all
-               $sql = "DELETE FROM $links WHERE l_to=$oldid OR l_to=$newid";
-               $dbw->query( $sql, $fname );
-
-               # Reinsert
-               if ( count( $linksToOld ) || count( $linksToNew )) {
-                       $sql = "INSERT INTO $links (l_from,l_to) VALUES ";
-                       $first = true;
-
-                       # Insert links to old title
-                       foreach ( $linksToOld as $linkTitle ) {
-                               if ( $first ) {
-                                       $first = false;
-                               } else {
-                                       $sql .= ',';
-                               }
-                               $id = $linkTitle->getArticleID();
-                               $sql .= "($id,$newid)";
-                       }
-
-                       # Insert links to new title
-                       foreach ( $linksToNew as $linkTitle ) {
-                               if ( $first ) {
-                                       $first = false;
-                               } else {
-                                       $sql .= ',';
-                               }
-                               $id = $linkTitle->getArticleID();
-                               $sql .= "($id, $oldid)";
-                       }
-
-                       $dbw->query( $sql, DB_MASTER, $fname );
-               }
-
                # Now, we record the link from the redirect to the new title.
                # It should have no other outgoing links...
-               $dbw->delete( 'links', array( 'l_from' => $newid ) );
-               $dbw->insert( 'links', array( 'l_from' => $newid, 'l_to' => $oldid ) );
-               
-               # Clear linkscc
-               LinkCache::linksccClearLinksTo( $oldid );
-               LinkCache::linksccClearLinksTo( $newid );
+               $dbw->delete( 'pagelinks', array( 'pl_from' => $newid ), $fname );
+               $dbw->insert( 'pagelinks',
+                       array(
+                               'pl_from'      => $newid,
+                               'pl_namespace' => $this->getNamespace(),
+                               'pl_title'     => $this->getDbKey() ),
+                       $fname );
                
                # Purge squid
                if ( $wgUseSquid ) {
@@ -1534,26 +1656,35 @@ class Title {
         * @param int &$newid set to be the new article ID
         * @access private
         */
-       /* private */ function moveToNewTitle( &$nt, &$newid ) {
+       function moveToNewTitle( &$nt, &$newid, $reason = '' ) {
                global $wgUser, $wgLinkCache, $wgUseSquid;
                global $wgMwRedir;
                $fname = 'MovePageForm::moveToNewTitle';
                $comment = wfMsgForContent( '1movedto2', $this->getPrefixedText(), $nt->getPrefixedText() );
+               if ( $reason ) {
+                       $comment .= ": $reason";
+               }
 
                $newid = $nt->getArticleID();
                $oldid = $this->getArticleID();
                $dbw =& wfGetDB( DB_MASTER );
                $now = $dbw->timestamp();
-               $won = wfInvertTimestamp( wfTimestamp(TS_MW,$now) );
                wfSeedRandom();
                $rand = wfRandom();
 
+               # Save a null revision in the page's history notifying of the move
+               $nullRevision = Revision::newNullRevision( $dbw, $oldid,
+                       wfMsg( '1movedto2', $this->getPrefixedText(), $nt->getPrefixedText() ),
+                       true );
+               $nullRevId = $nullRevision->insertOn( $dbw );
+               
                # Rename cur entry
                $dbw->update( 'page',
                        /* SET */ array(
-                               'page_touched' => $now,
+                               'page_touched'   => $now,
                                'page_namespace' => $nt->getNamespace(),
-                               'page_title' => $nt->getDBkey()
+                               'page_title'     => $nt->getDBkey(),
+                               'page_latest'    => $nullRevId,
                        ),
                        /* WHERE */ array( 'page_id' => $oldid ),
                        $fname
@@ -1563,51 +1694,34 @@ class Title {
 
                # Insert redirect
                $redirectText = $wgMwRedir->getSynonym( 0 ) . ' [[' . $nt->getPrefixedText() . "]]\n";
-               $dbw->insert( 'revision', array(
-                       'rev_id' => $dbw->nextSequenceValue('rev_rev_id_seq'),
-                       'rev_comment' => $comment,
-                       'rev_user' => $wgUser->getID(),
-                       'rev_user_text' => $wgUser->getName(),
-                       'rev_timestamp' => $now,
-                       'inverse_timestamp' => $won ), $fname
-               );
-               $revid = $dbw->insertId();
-               $dbw->insert( 'text', array(
-                       'old_id' => $revid,
-                       'old_flags' => '',
-                       'old_text' => $redirectText
-                       ), $fname
-               );
-               $dbw->insert( 'page', array(
-                       'page_id' => $dbw->nextSequenceValue('page_page_id_seq'),
-                       'page_namespace' => $this->getNamespace(),
-                       'page_title' => $this->getDBkey(),
-                       'page_touched' => $now,
-                       'page_is_redirect' => 1,
-                       'page_random' => $rand,
-                       'page_is_new' => 1,
-                       'page_latest' => $revid), $fname
-               );
-               $newid = $dbw->insertId();
+               $redirectArticle = new Article( $this );
+               $newid = $redirectArticle->insertOn( $dbw );
+               $redirectRevision = new Revision( array(
+                       'page'    => $newid, 
+                       'comment' => $comment,
+                       'text'    => $redirectText ) );
+               $revid = $redirectRevision->insertOn( $dbw );
+               $redirectArticle->updateRevisionOn( $dbw, $redirectRevision, 0 );
                $wgLinkCache->clearLink( $this->getPrefixedDBkey() );
 
-               # Record in RC
-               RecentChange::notifyMoveToNew( $now, $this, $nt, $wgUser, $comment );
+               # Log the move
+               $log = new LogPage( 'move' );
+               $log->addEntry( 'move', $this, $reason, array( 1 => $nt->getPrefixedText()) );
 
-               # Purge squid and linkscc as per article creation
+               # Purge caches as per article creation
                Article::onArticleCreate( $nt );
 
-               # Any text links to the old title must be reassigned to the redirect
-               $dbw->update( 'links', array( 'l_to' => $newid ), array( 'l_to' => $oldid ), $fname );
-               LinkCache::linksccClearLinksTo( $oldid );
-
                # Record the just-created redirect's linking to the page
-               $dbw->insert( 'links', array( 'l_from' => $newid, 'l_to' => $oldid ), $fname );
+               $dbw->insert( 'pagelinks',
+                       array(
+                               'pl_from'      => $newid,
+                               'pl_namespace' => $this->getNamespace(),
+                               'pl_title'     => $this->getDBkey() ),
+                       $fname );
 
                # Non-existent target may have had broken links to it; these must
-               # now be removed and made into good links.
-               $update = new LinksUpdate( $oldid, $nt->getPrefixedDBkey() );
-               $update->fixBrokenLinks();
+               # now be touched to update link coloring.
+               $nt->touchLinks();
 
                # Purge old title from squid
                # The new title, and links to the new title, are purged in Article::onArticleCreate()
@@ -1636,9 +1750,9 @@ class Title {
 
                # Is it a redirect?
                $id  = $nt->getArticleID();
-               $obj = $dbw->selectRow( array( 'page', 'text') ,
-                       array( 'page_is_redirect','old_text' ), 
-                       array( 'page_id' => $id, 'page_latest=old_id' ),
+               $obj = $dbw->selectRow( array( 'page', 'revision', 'text'),
+                       array( 'page_is_redirect','old_text' ),
+                       array( 'page_id' => $id, 'page_latest=rev_id', 'rev_text_id=old_id' ),
                        $fname, 'FOR UPDATE' );
 
                if ( !$obj || 0 == $obj->page_is_redirect ) { 
@@ -1685,61 +1799,25 @@ class Title {
                
                $fname = 'Title::createRedirect';
                $dbw =& wfGetDB( DB_MASTER );
-               $now = wfTimestampNow();
-               $won = wfInvertTimestamp( $now );
-               
-               $seqVal = $dbw->nextSequenceValue( 'page_page_id_seq' );
-               $dbw->insert( 'page', array(
-                       'page_id' => $seqVal,
-                       'page_namespace' => $this->getNamespace(),
-                       'page_title' => $this->getDBkey(),
-                       'page_touched' => $now,
-                       'page_is_redirect' => 1,
-                       'page_is_new' => 1,
-                       'page_latest' => NULL,
-               ), $fname );
-               $newid = $dbw->insertId();
-
-               $seqVal = $dbw->nextSequenceValue( 'text_old_id_seq' );
-               $dbw->insert( 'text', array(
-                       'old_id' => $seqVal,
-                       'old_flags' => '',
-                       'old_text' => "#REDIRECT [[" . $dest->getPrefixedText() . "]]\n"
-               ), $fname );
-               $revisionId = $dbw->insertId();
                
-               $dbw->insert( 'revision', array(
-                       'rev_id' => $seqVal,
-                       'rev_page' => $newid,
-                       'rev_comment' => $comment,
-                       'rev_user' => $wgUser->getID(),
-                       'rev_user_text' => $wgUser->getName(),
-                       'rev_timestamp' => $now,
-                       'inverse_timestamp' => $won,
-               ), $fname );
-               
-               $dbw->update( 'page',
-                       /* SET */   array( 'page_latest' => $revisionId ),
-                       /* WHERE */ array( 'page_id' => $newid ),
-                       $fname );
-               $this->resetArticleID( $newid );
+               $article = new Article( $this );
+               $newid = $article->insertOn( $dbw );
+               $revision = new Revision( array(
+                       'page'      => $newid,
+                       'comment'   => $comment,
+                       'text'      => "#REDIRECT [[" . $dest->getPrefixedText() . "]]\n",
+                       ) );
+               $revisionId = $revision->insertOn( $dbw );
+               $article->updateRevisionOn( $dbw, $revision, 0 );
                
                # Link table
-               if ( $dest->getArticleID() ) {
-                       $dbw->insert( 'links', 
-                               array(
-                                       'l_to' => $dest->getArticleID(),
-                                       'l_from' => $newid
-                               ), $fname 
-                       );
-               } else {
-                       $dbw->insert( 'brokenlinks', 
-                               array( 
-                                       'bl_to' => $dest->getPrefixedDBkey(),
-                                       'bl_from' => $newid
-                               ), $fname
-                       );
-               }
+               $dbw->insert( 'pagelinks', 
+                       array(
+                               'pl_from'      => $newid,
+                               'pl_namespace' => $dest->getNamespace(),
+                               'pl_title'     => $dest->getDbKey()
+                       ), $fname 
+               );
 
                Article::onArticleCreate( $this );
                return true;
@@ -1857,6 +1935,69 @@ class Title {
                        'rev_page=' . IntVal( $this->getArticleId() ) .
                        ' AND rev_id>' . IntVal( $revision ) . ' ORDER BY rev_id' );
        }
+       
+       /**
+        * Compare with another title.
+        *
+        * @param Title $title
+        * @return bool
+        */
+       function equals( &$title ) {
+               return $this->getInterwiki() == $title->getInterwiki()
+                       && $this->getNamespace() == $title->getNamespace()
+                       && $this->getDbkey() == $title->getDbkey();
+       }
+       
+       /**
+        * Check if page exists
+        * @return bool
+        */
+       function exists() {
+               return $this->getArticleId() != 0;
+       }
+
+       /**
+        * Should a link should be displayed as a known link, just based on its title?
+        * 
+        * Currently, a self-link with a fragment, special pages and image pages are in 
+        * this category. Special pages never exist in the database. Some images do not
+        * have description pages in the database, but the description page contains 
+        * useful history information that the user may want to link to.
+        * 
+        */
+       function isAlwaysKnown() {
+               return ( 0 == $this->mNamespace && "" == $this->mDbkeyform ) 
+                 || NS_SPECIAL == $this->mNamespace || NS_IMAGE == $this->mNamespace;
+       }
+
+       /**
+        * Update page_touched timestamps on pages linking to this title.
+        * In principal, this could be backgrounded and could also do squid
+        * purging.
+        */
+       function touchLinks() {
+               $fname = 'Title::touchLinks';
+
+               $dbw =& wfGetDB( DB_MASTER );
+               
+               $res = $dbw->select( 'pagelinks',
+                       array( 'pl_from' ),
+                       array(
+                               'pl_namespace' => $this->getNamespace(),
+                               'pl_title'     => $this->getDbKey() ), 
+                       $fname );
+               if ( 0 == $dbw->numRows( $res ) ) {
+                       return;
+               }
 
+               $arr = array();
+               $toucharr = array();
+               while( $row = $dbw->fetchObject( $res ) ) {
+                       $toucharr[] = $row->pl_from;
+               }
+               
+               $dbw->update( 'page', /* SET */ array( 'page_touched' => $dbw->timestamp() ), 
+                                                       /* WHERE */ array( 'page_id' => $toucharr ),$fname);
+       }
 }
 ?>