* Replace wfMungeToUtf8 and do_html_entity_decode with a single function
[lhc/web/wiklou.git] / includes / Title.php
index ef11553..b32424f 100644 (file)
@@ -1,17 +1,22 @@
 <?php
 /**
- * $Id$
- * See title.doc
+ * See title.txt
  * 
  * @package MediaWiki
  */
 
-/** */
 require_once( 'normal/UtfNormal.php' );
 
 $wgTitleInterwikiCache = array();
 define ( 'GAID_FOR_UPDATE', 1 );
 
+# Title::newFromTitle maintains a cache to avoid
+# expensive re-normalization of commonly used titles.
+# On a batch operation this can become a memory leak
+# if not bounded. After hitting this many titles,
+# reset the cache.
+define( 'MW_TITLECACHE_MAX', 1000 );
+
 /**
  * Title class
  * - Represents a title, which may contain an interwiki designation or namespace
@@ -42,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()
        /**#@-*/
        
 
@@ -53,10 +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();
-               $this->mDefaultNamespace = 0;
+               # Dont change the following, NS_MAIN is hardcoded in several place
+               # See bug #696
+               $this->mDefaultNamespace = NS_MAIN;
+               $this->mWatched = NULL;
        }
 
        /**
@@ -90,33 +99,49 @@ 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( 'Called with object instead of string.' );
+                       wfDebugDieBacktrace( 'Title::newFromText given an object' );
                }
-               global $wgInputEncoding;
-               $text = do_html_entity_decode( $text, ENT_COMPAT, $wgInputEncoding );
-
-               $text = wfMungeToUtf8( $text );
-               
                
-               # What was this for? TS 2004-03-03
-               # $text = urldecode( $text );
+               /**
+                * Wiki pages often contain multiple links to the same page.
+                * Title normalization and parsing can become expensive on
+                * pages with many links, so we can save a little time by
+                * caching them.
+                *
+                * In theory these are value objects and won't get changed...
+                */
+               static $titleCache = array();
+               if( $defaultNamespace == NS_MAIN && isset( $titleCache[$text] ) ) {
+                       wfProfileOut( $fname );
+                       return $titleCache[$text];
+               }
 
-               $t = new Title();
-               $t->mDbkeyform = str_replace( ' ', '_', $text );
+               /**
+                * Convert things like &eacute; &#257; or &#x3017; into real text...
+                */
+               $filteredText = Sanitizer::decodeCharReferences( $text );
+
+               $t =& new Title();
+               $t->mDbkeyform = str_replace( ' ', '_', $filteredText );
                $t->mDefaultNamespace = $defaultNamespace;
 
-               wfProfileOut( $fname );
-               if ( !is_object( $t ) ) {
-                       var_dump( debug_backtrace() );
-               }
                if( $t->secureAndSplit() ) {
+                       if( $defaultNamespace == NS_MAIN ) {
+                               if( count( $titleCache ) >= MW_TITLECACHE_MAX ) {
+                                       # Avoid memory leaks on mass operations...
+                                       $titleCache = array();
+                               }
+                               $titleCache[$text] =& $t;
+                       }
+                       wfProfileOut( $fname );
                        return $t;
                } else {
+                       wfProfileOut( $fname );
                        return NULL;
                }
        }
@@ -129,7 +154,7 @@ class Title {
         * @static
         * @access public
         */
-       /* static */ function newFromURL( $url ) {
+       function newFromURL( $url ) {
                global $wgLang, $wgServer;
                $t = new Title();
                
@@ -148,19 +173,22 @@ class Title {
        
        /**
         * Create a new Title from an article ID
-        * @todo This is inefficiently implemented, the cur row is requested
-        * but not used for anything else
-        * @param int $id the cur_id corresponding to the Title to create
+        *
+        * @todo This is inefficiently implemented, the page row is requested
+        *       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->getArray( 'cur', array( 'cur_namespace', 'cur_title' ), 
-                       array( 'cur_id' => $id ), $fname );
+               $row = $dbr->selectRow( 'page', array( 'page_namespace', 'page_title' ), 
+                       array( 'page_id' => $id ), $fname );
                if ( $row !== false ) {
-                       $title = Title::makeTitle( $row->cur_namespace, $row->cur_title );
+                       $title = Title::makeTitle( $row->page_namespace, $row->page_title );
                } else {
                        $title = NULL;
                }
@@ -171,20 +199,23 @@ class Title {
         * Create a new Title from a namespace index and a DB key.
         * It's assumed that $ns and $title are *valid*, for instance when
         * they came directly from the database or a special page name.
+        * For convenience, spaces are converted to underscores so that
+        * eg user_text fields can be used directly.
+        *
         * @param int $ns the namespace of the article
         * @param string $title the unprefixed database key form
         * @return Title the new object
         * @static
         * @access public
         */
-       /* static */ function &makeTitle( $ns, $title ) {
+       function &makeTitle( $ns, $title ) {
                $t =& new Title();
                $t->mInterwiki = '';
                $t->mFragment = '';
                $t->mNamespace = IntVal( $ns );
-               $t->mDbkeyform = $title;
+               $t->mDbkeyform = str_replace( ' ', '_', $title );
                $t->mArticleID = ( $ns >= 0 ) ? -1 : 0;
-               $t->mUrlform = wfUrlencode( $title );
+               $t->mUrlform = wfUrlencode( $t->mDbkeyform );
                $t->mTextform = str_replace( '_', ' ', $title );
                return $t;
        }
@@ -193,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() ) {
@@ -211,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' ) );
        }
 
@@ -227,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) == ':') {
@@ -255,20 +288,20 @@ class Title {
 
        /**
         * Get the prefixed DB key associated with an ID
-        * @param int $id the cur_id of the article
+        * @param int $id the page_id of the article
         * @return Title an object representing the article, or NULL
         *      if no such article was found
         * @static
         * @access public
         */
-       /* static */ function nameOf( $id ) {
+       function nameOf( $id ) {
                $fname = 'Title::nameOf';
                $dbr =& wfGetDB( DB_SLAVE );
                
-               $s = $dbr->getArray( 'cur', array( 'cur_namespace','cur_title' ),  array( 'cur_id' => $id ), $fname );
+               $s = $dbr->selectRow( 'page', array( 'page_namespace','page_title' ),  array( 'page_id' => $id ), $fname );
                if ( $s === false ) { return NULL; }
 
-               $n = Title::makeName( $s->cur_namespace, $s->cur_title );
+               $n = Title::makeName( $s->page_namespace, $s->page_title );
                return $n;
        }
 
@@ -323,7 +356,7 @@ class Title {
 
                $t = preg_replace( "/\\s+/", ' ', $t );
 
-               if ( $ns == Namespace::getImage() ) {
+               if ( $ns == NS_IMAGE ) {
                        $t = preg_replace( "/ (png|gif|jpg|jpeg|ogg)$/", "", $t );
                }
                return trim( $t );
@@ -339,8 +372,7 @@ class Title {
                global $wgContLang;
 
                $n = $wgContLang->getNsText( $ns );
-               if ( '' == $n ) { return $title; }
-               else { return $n.':'.$title; }
+               return $n == '' ? $title : "$n:$title";
        }
        
        /**
@@ -354,23 +386,34 @@ class Title {
        function getInterwikiLink( $key ) {     
                global $wgMemc, $wgDBname, $wgInterwikiExpiry, $wgTitleInterwikiCache;
                $fname = 'Title::getInterwikiLink';
+               
+               wfProfileIn( $fname );
+               
                $k = $wgDBname.':interwiki:'.$key;
-
-               if( array_key_exists( $k, $wgTitleInterwikiCache ) )
+               if( array_key_exists( $k, $wgTitleInterwikiCache ) ) {
+                       wfProfileOut( $fname );
                        return $wgTitleInterwikiCache[$k]->iw_url;
+               }
 
                $s = $wgMemc->get( $k ); 
                # Ignore old keys with no iw_local
                if( $s && isset( $s->iw_local ) ) { 
                        $wgTitleInterwikiCache[$k] = $s;
+                       wfProfileOut( $fname );
                        return $s->iw_url;
                }
+               
                $dbr =& wfGetDB( DB_SLAVE );
-               $res = $dbr->select( 'interwiki', array( 'iw_url', 'iw_local' ), array( 'iw_prefix' => $key ), $fname );
-               if(!$res) return '';
+               $res = $dbr->select( 'interwiki',
+                       array( 'iw_url', 'iw_local' ),
+                       array( 'iw_prefix' => $key ), $fname );
+               if( !$res ) {
+                       wfProfileOut( $fname );
+                       return '';
+               }
                
                $s = $dbr->fetchObject( $res );
-               if(!$s) {
+               if( !$s ) {
                        # Cache non-existence: create a blank object and save it to memcached
                        $s = (object)false;
                        $s->iw_url = '';
@@ -378,6 +421,8 @@ class Title {
                }
                $wgMemc->set( $k, $s, $wgInterwikiExpiry );
                $wgTitleInterwikiCache[$k] = $s;
+               
+               wfProfileOut( $fname );
                return $s->iw_url;
        }
 
@@ -403,7 +448,7 @@ class Title {
        }
 
        /**
-        * Update the cur_touched field for an array of title objects
+        * Update the page_touched field for an array of title objects
         * @todo Inefficient unless the IDs are already loaded into the
         *      link cache
         * @param array $titles an array of Title objects to be touched
@@ -412,7 +457,7 @@ class Title {
         * @static
         * @access public
         */
-       /* static */ function touchArray( $titles, $timestamp = '' ) {
+       function touchArray( $titles, $timestamp = '' ) {
                if ( count( $titles ) == 0 ) {
                        return;
                }
@@ -420,8 +465,8 @@ class Title {
                if ( $timestamp == '' ) {
                        $timestamp = $dbw->timestamp();
                }
-               $cur = $dbw->tableName( 'cur' );
-               $sql = "UPDATE $cur SET cur_touched='{$timestamp}' WHERE cur_id IN (";
+               $page = $dbw->tableName( 'page' );
+               $sql = "UPDATE $page SET page_touched='{$timestamp}' WHERE page_id IN (";
                $first = true;
 
                foreach ( $titles as $title ) {
@@ -466,12 +511,6 @@ class Title {
         * @access public
         */
        function getNamespace() { return $this->mNamespace; }
-       /**
-        * Set the namespace index
-        * @param int $n the namespace index, one of the NS_xxxx constants
-        * @access public
-        */
-       function setNamespace( $n ) { $this->mNamespace = IntVal( $n ); }
        /**
         * Get the interwiki prefix (or null string)
         * @return string
@@ -556,8 +595,6 @@ class Title {
                $s = wfUrlencode ( $s ) ;
                
                # Cleaning up URL to make it look nice -- is this safe?
-               $s = preg_replace( '/%3[Aa]/', ':', $s );
-               $s = preg_replace( '/%2[Ff]/', '/', $s );
                $s = str_replace( '%28', '(', $s );
                $s = str_replace( '%29', ')', $s );
 
@@ -574,31 +611,93 @@ 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 .= ':';
-                       }
-                       $url = str_replace( '$1', $namespace . $this->mUrlform, $baseUrl );
-                       if ( '' != $this->mFragment ) {
-                               $url .= '#' . $this->mFragment;
+               }
+               
+               $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 .= '&';
                        }
-                       return $url;
+                       $url .= $query;
+               }
+               if ( '' != $this->mFragment ) {
+                       $url .= '#' . $this->mFragment;
                }
+               return $url;
        }
 
-       /**
-        * @deprecated
+       /** 
+        * Get a relative directory for putting an HTML version of this article into
         */
-       function getURL() {
-               die( 'Call to obsolete obsolete function Title::getURL()' );
+       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 $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";       
        }
        
        /**
@@ -609,25 +708,33 @@ 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 = '';
                        }
-                       if ( $wgScript != '' ) {
-                               $url = "{$wgScript}?title={$dbkey}&{$query}";
-                       } else {
-                               # Top level wiki
-                               $url = "/{$dbkey}?{$query}";
-                       }
+                       $url = "{$wgScript}?title={$dbkey}&{$query}";
                }
                return $url;
        }
@@ -703,33 +810,21 @@ class Title {
 
        /**
         * Does the title correspond to a protected article?
+        * @param string $what the action the page is protected from,
+        *      by default checks move and edit
         * @return boolean
         * @access public
         */
-       function isProtected() {
+       function isProtected($action = '') {
                if ( -1 == $this->mNamespace ) { return true; }
-               $a = $this->getRestrictions();
-               if ( in_array( 'sysop', $a ) ) { return true; }
-               return false;
-       }
-
-       /**
-        * Is the page a log page, i.e. one where the history is messed up by 
-        * LogPage.php? This used to be used for suppressing diff links in
-        * recent changes, but now that's done by setting a flag in the
-        * recentchanges table. Hence, this probably is no longer used.
-        *
-        * @deprecated
-        * @access public
-        */
-       function isLog() {
-               if ( $this->mNamespace != Namespace::getWikipedia() ) {
-                       return false;
-               }
-               if ( ( 0 == strcmp( wfMsg( 'uploadlogpage' ), $this->mDbkeyform ) ) ||
-                 ( 0 == strcmp( wfMsg( 'dellogpage' ), $this->mDbkeyform ) ) ) {
-                       return true;
+               if($action == 'edit' || $action == '') {
+                       $a = $this->getRestrictions("edit");
+                       if ( in_array( 'sysop', $a ) ) { return true; }
                }
+               if($action == 'move' || $action == '') {
+                       $a = $this->getRestrictions("move");
+                       if ( in_array( 'sysop', $a ) ) { return true; } 
+               }       
                return false;
        }
 
@@ -741,46 +836,111 @@ 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;
        }
 
-       /**
-        * Can $wgUser edit this page?
+       /**
+        * Is $wgUser perform $action this page?
+        * @param string $action action that permission needs to be checked for
         * @return boolean
-        * @access public
-        */
-       function userCanEdit() {
+        * @access private
+        */
+       function userCan($action) {
+               $fname = 'Title::userCanEdit';
+               wfProfileIn( $fname );
+
                global $wgUser;
-               if ( -1 == $this->mNamespace ) { return false; }
-               if ( NS_MEDIAWIKI == $this->mNamespace && !$wgUser->isSysop() ) { return false; }
-               # if ( 0 == $this->getArticleID() ) { return false; }
-               if ( $this->mDbkeyform == '_' ) { return false; }
+               if( NS_SPECIAL == $this->mNamespace ) {
+                       wfProfileOut( $fname );
+                       return false;
+               }
+               if( NS_MEDIAWIKI == $this->mNamespace &&
+                   !$wgUser->isAllowed('editinterface') ) {
+                       wfProfileOut( $fname );
+                       return false;
+               }
+               if( $this->mDbkeyform == '_' ) {
+                       # FIXME: Is this necessary? Shouldn't be allowed anyway...
+                       wfProfileOut( $fname );
+                       return false;
+               }
+               
                # protect global styles and js
                if ( NS_MEDIAWIKI == $this->mNamespace 
-                    && preg_match("/\\.(css|js)$/", $this->mTextform )
-                    && !$wgUser->isSysop() )
-               { return false; }
-               //if ( $this->isCssJsSubpage() and !$this->userCanEditCssJsSubpage() ) { return false; }
+                && preg_match("/\\.(css|js)$/", $this->mTextform )
+                    && !$wgUser->isAllowed('editinterface') ) {
+                       wfProfileOut( $fname );
+                       return false;
+               }
+               
                # protect css/js subpages of user pages
                # XXX: this might be better using restrictions
                # XXX: Find a way to work around the php bug that prevents using $this->userCanEditCssJsSubpage() from working
-               if( Namespace::getUser() == $this->mNamespace
-                       and preg_match("/\\.(css|js)$/", $this->mTextform )
-                       and !$wgUser->isSysop()
-                       and !preg_match('/^'.preg_quote($wgUser->getName(), '/').'/', $this->mTextform) )
-               { return false; }
-               $ur = $wgUser->getRights();
-               foreach ( $this->getRestrictions() as $r ) {
-                       if ( '' != $r && ( ! in_array( $r, $ur ) ) ) {
+               if( NS_USER == $this->mNamespace
+                       && preg_match("/\\.(css|js)$/", $this->mTextform )
+                       && !$wgUser->isAllowed('editinterface')
+                       && !preg_match('/^'.preg_quote($wgUser->getName(), '/').'\//', $this->mTextform) ) {
+                       wfProfileOut( $fname );
+                       return false;
+               }
+
+               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;
        }
 
+       /**
+        * Can $wgUser edit this page?
+        * @return boolean
+        * @access public
+        */
+       function userCanEdit() {
+               return $this->userCan('edit');
+       }
+       
+       /**
+        * Can $wgUser move this page?
+        * @return boolean
+        * @access public
+        */     
+       function userCanMove() {
+               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
@@ -788,20 +948,44 @@ class Title {
         */
        function userCanRead() {
                global $wgUser;
-               global $wgWhitelistRead;
                
-               if( 0 != $wgUser->getID() ) return true;
-               if( !is_array( $wgWhitelistRead ) ) return true;
-               
-               $name = $this->getPrefixedText();
-               if( in_array( $name, $wgWhitelistRead ) ) return true;
-               
-               # Compatibility with old settings
-               if( $this->getNamespace() == NS_MAIN ) {
-                       if( in_array( ':' . $name, $wgWhitelistRead ) ) return true;
+               if( $wgUser->isAllowed('read') ) {
+                       return true;
+               } else {
+                       global $wgWhitelistRead;
+                       
+                       /** If anon users can create an account,
+                           they need to reach the login page first! */
+                       if( $wgUser->isAllowed( 'createaccount' )
+                           && $this->mId == NS_SPECIAL
+                           && $this->getText() == 'Userlogin' ) {
+                               return true;
+                       }
+
+                       /** some pages are explicitly allowed */
+                       $name = $this->getPrefixedText();
+                       if( $wgWhitelistRead && in_array( $name, $wgWhitelistRead ) ) {
+                               return true;
+                       }
+                       
+                       # Compatibility with old settings
+                       if( $wgWhitelistRead && $this->getNamespace() == NS_MAIN ) {
+                               if( in_array( ':' . $name, $wgWhitelistRead ) ) {
+                                       return true;
+                               }
+                       }
                }
                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?
@@ -809,7 +993,7 @@ class Title {
         * @access public
         */
        function isCssJsSubpage() {
-               return ( Namespace::getUser() == $this->mNamespace and preg_match("/\\.(css|js)$/", $this->mTextform ) );
+               return ( NS_USER == $this->mNamespace and preg_match("/\\.(css|js)$/", $this->mTextform ) );
        }
        /**
         * Is this a .css subpage of a user page?
@@ -817,7 +1001,7 @@ class Title {
         * @access public
         */
        function isCssSubpage() {
-               return ( Namespace::getUser() == $this->mNamespace and preg_match("/\\.css$/", $this->mTextform ) );
+               return ( NS_USER == $this->mNamespace and preg_match("/\\.css$/", $this->mTextform ) );
        }
        /**
         * Is this a .js subpage of a user page?
@@ -825,7 +1009,7 @@ class Title {
         * @access public
         */
        function isJsSubpage() {
-               return ( Namespace::getUser() == $this->mNamespace and preg_match("/\\.js$/", $this->mTextform ) );
+               return ( NS_USER == $this->mNamespace and preg_match("/\\.js$/", $this->mTextform ) );
        }
        /**
         * Protect css/js subpages of user pages: can $wgUser edit
@@ -837,25 +1021,47 @@ class Title {
         */
        function userCanEditCssJsSubpage() {
                global $wgUser;
-               return ( $wgUser->isSysop() or preg_match('/^'.preg_quote($wgUser->getName()).'/', $this->mTextform) );
+               return ( $wgUser->isAllowed('editinterface') or preg_match('/^'.preg_quote($wgUser->getName(), '/').'\//', $this->mTextform) );
+       }
+
+       /**
+        * Loads a string into mRestrictions array
+        * @param string $res restrictions in string format      
+        * @access public
+        */
+       function loadRestrictions( $res ) {
+               foreach( explode( ':', trim( $res ) ) as $restrict ) {
+                       $temp = explode( '=', trim( $restrict ) );
+                       if(count($temp) == 1) {
+                               // old format should be treated as edit/move restriction
+                               $this->mRestrictions["edit"] = explode( ',', trim( $temp[0] ) );
+                               $this->mRestrictions["move"] = explode( ',', trim( $temp[0] ) );
+                       } else {
+                               $this->mRestrictions[$temp[0]] = explode( ',', trim( $temp[1] ) );
+                       }
+               }
+               $this->mRestrictionsLoaded = true;
        }
 
        /**
         * Accessor/initialisation for mRestrictions
+        * @param string $action action that permission needs to be checked for  
         * @return array the array of groups allowed to edit this article
         * @access public
         */
-       function getRestrictions() {
+       function getRestrictions($action) {
                $id = $this->getArticleID();
                if ( 0 == $id ) { return array(); }
 
                if ( ! $this->mRestrictionsLoaded ) {
                        $dbr =& wfGetDB( DB_SLAVE );
-                       $res = $dbr->getField( 'cur', 'cur_restrictions', 'cur_id='.$id );
-                       $this->mRestrictions = explode( ',', trim( $res ) );
-                       $this->mRestrictionsLoaded = true;
+                       $res = $dbr->selectField( 'page', 'page_restrictions', 'page_id='.$id );
+                       $this->loadRestrictions( $res );
+               }
+               if( isset( $this->mRestrictions[$action] ) ) {
+                       return $this->mRestrictions[$action];
                }
-               return $this->mRestrictions;
+               return array();
        }
        
        /**
@@ -866,7 +1072,7 @@ class Title {
        function isDeleted() {
                $fname = 'Title::isDeleted';
                $dbr =& wfGetDB( DB_SLAVE );
-               $n = $dbr->getField( 'archive', 'COUNT(*)', array( 'ar_namespace' => $this->getNamespace(), 
+               $n = $dbr->selectField( 'archive', 'COUNT(*)', array( 'ar_namespace' => $this->getNamespace(), 
                        'ar_title' => $this->getDBkey() ), $fname );
                return (int)$n;
        }
@@ -899,7 +1105,7 @@ class Title {
         * keys in the "bad links" section of $wgLinkCache.
         *
         * - This is called from Article::insertNewArticle() to allow
-        * loading of the new cur_id. It's also called from
+        * loading of the new page_id. It's also called from
         * Article::doDeleteArticle()
         *
         * @param int $newid the new Article ID
@@ -916,19 +1122,23 @@ class Title {
        }
        
        /**
-        * Updates cur_touched for this page; called from LinksUpdate.php
+        * Updates page_touched for this page; called from LinksUpdate.php
         * @return bool true if the update succeded
         * @access public
         */
        function invalidateCache() {
+               if ( wfReadOnly() ) {
+                       return;
+               }
+
                $now = wfTimestampNow();
                $dbw =& wfGetDB( DB_MASTER );
-               $success = $dbw->updateArray( 'cur', 
+               $success = $dbw->update( 'page', 
                        array( /* SET */ 
-                               'cur_touched' => $dbw->timestamp()
+                               'page_touched' => $dbw->timestamp()
                        ), array( /* WHERE */ 
-                               'cur_namespace' => $this->getNamespace() ,
-                               'cur_title' => $this->getDBkey()
+                               'page_namespace' => $this->getNamespace() ,
+                               'page_title' => $this->getDBkey()
                        ), 'Title::invalidateCache'
                );
                return $success;
@@ -966,20 +1176,16 @@ class Title {
         * @return bool true on success
         * @access private
         */
-       /* private */ function secureAndSplit()
-       {
+       /* private */ function secureAndSplit() {
                global $wgContLang, $wgLocalInterwiki, $wgCapitalLinks;
                $fname = 'Title::secureAndSplit';
                wfProfileIn( $fname );
                
-               static $imgpre = false;
-               static $rxTc = false;
-
                # Initialisation
-               if ( $imgpre === false ) {
-                       $imgpre = ':' . $wgContLang->getNsText( Namespace::getImage() ) . ':';
+               static $rxTc = false;
+               if( !$rxTc ) {
                        # % is needed as well
-                       $rxTc = '/[^' . Title::legalChars() . ']/';
+                       $rxTc = '/[^' . Title::legalChars() . ']|%[0-9A-Fa-f]{2}/S';
                }
 
                $this->mInterwiki = $this->mFragment = '';
@@ -987,28 +1193,21 @@ class Title {
 
                # Clean up whitespace
                #
-               $t = preg_replace( "/[\\s_]+/", '_', $this->mDbkeyform );
-               $t = preg_replace( '/^_*(.*?)_*$/', '$1', $t );
+               $t = preg_replace( '/[ _]+/', '_', $this->mDbkeyform );
+               $t = trim( $t, '_' );
 
                if ( '' == $t ) {
                        wfProfileOut( $fname );
                        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;
                }
 
                $this->mDbkeyform = $t;
-               $done = false;
-
-               # :Image: namespace
-               if ( 0 == strncasecmp( $imgpre, $t, strlen( $imgpre ) ) ) {
-                       $t = substr( $t, 1 );
-               }
 
                # Initial colon indicating main namespace
                if ( ':' == $t{0} ) {
@@ -1016,37 +1215,52 @@ class Title {
                        $this->mNamespace = NS_MAIN;
                } else {
                        # Namespace or interwiki prefix
-                       if ( preg_match( "/^(.+?)_*:_*(.*)$/", $t, $m ) ) {
-                               #$p = strtolower( $m[1] );
-                               $p = $m[1];
-                               $lowerNs = strtolower( $p );
-                               if ( $ns = Namespace::getCanonicalIndex( $lowerNs ) ) {
-                                       # Canonical namespace
-                                       $t = $m[2];
-                                       $this->mNamespace = $ns;
-                               } elseif ( $ns = $wgContLang->getNsIndex( $lowerNs )) {
-                                       # Ordinary namespace
-                                       $t = $m[2];
-                                       $this->mNamespace = $ns;
-                               } elseif ( $this->getInterwikiLink( $p ) ) {
-                                       # Interwiki link
-                                       $t = $m[2];
-                                       $this->mInterwiki = $p;
-
-                                       if ( !preg_match( "/^([A-Za-z0-9_\\x80-\\xff]+):(.*)$/", $t, $m ) ) {
-                                               $done = true;
-                                       } elseif($this->mInterwiki != $wgLocalInterwiki) {
-                                               $done = true;
+                       $firstPass = true;
+                       do {
+                               if ( preg_match( "/^(.+?)_*:_*(.*)$/S", $t, $m ) ) {
+                                       $p = $m[1];
+                                       $lowerNs = strtolower( $p );
+                                       if ( $ns = Namespace::getCanonicalIndex( $lowerNs ) ) {
+                                               # Canonical namespace
+                                               $t = $m[2];
+                                               $this->mNamespace = $ns;
+                                       } elseif ( $ns = $wgContLang->getNsIndex( $lowerNs )) {
+                                               # Ordinary namespace
+                                               $t = $m[2];
+                                               $this->mNamespace = $ns;
+                                       } elseif( $this->getInterwikiLink( $p ) ) {
+                                               if( !$firstPass ) {
+                                                       # Can't make a local interwiki link to an interwiki link.
+                                                       # That's just crazy!
+                                                       wfProfileOut( $fname );
+                                                       return false;
+                                               }
+                                               
+                                               # Interwiki link
+                                               $t = $m[2];
+                                               $this->mInterwiki = $p;
+       
+                                               # Redundant interwiki prefix to the local wiki
+                                               if ( 0 == strcasecmp( $this->mInterwiki, $wgLocalInterwiki ) ) {
+                                                       if( $t == '' ) {
+                                                               # Can't have an empty self-link
+                                                               wfProfileOut( $fname );
+                                                               return false;
+                                                       }
+                                                       $this->mInterwiki = '';
+                                                       $firstPass = false;
+                                                       # Do another namespace split...
+                                                       continue;
+                                               }
                                        }
+                                       # If there's no recognized interwiki or namespace,
+                                       # then let the colon expression be part of the title.
                                }
-                       }
+                               break;
+                       } while( true );
                        $r = $t;
                }
 
-               # Redundant interwiki prefix to the local wiki
-               if ( 0 == strcmp( $this->mInterwiki, $wgLocalInterwiki ) ) {
-                       $this->mInterwiki = '';
-               }
                # We already know that some pages won't be in the database!
                #
                if ( '' != $this->mInterwiki || -1 == $this->mNamespace ) {
@@ -1068,7 +1282,11 @@ class Title {
                        return false;
                }
                
-               # "." and ".." conflict with the directories of those namesa
+               /**
+                * Pages with "/./" or "/../" appearing in the URLs will
+                * often be unreachable due to the way web browsers deal
+                * with 'relative' URLs. Forbid them explicitly.
+                */
                if ( strpos( $r, '.' ) !== false &&
                     ( $r === '.' || $r === '..' ||
                       strpos( $r, './' ) === 0  ||
@@ -1081,18 +1299,38 @@ class Title {
                }
 
                # We shouldn't need to query the DB for the size.
-               #$maxSize = $dbr->textFieldSize( 'cur', 'cur_title' );
+               #$maxSize = $dbr->textFieldSize( 'page', 'page_title' );
                if ( strlen( $r ) > 255 ) {
+                       wfProfileOut( $fname );
                        return false;
                }
 
-               # Initial capital letter
+               /**
+                * Normally, all wiki links are forced to have
+                * an initial capital letter so [[foo]] and [[Foo]]
+                * point to the same place.
+                *
+                * Don't force it for interwikis, since the other
+                * site might be case-sensitive.
+                */
                if( $wgCapitalLinks && $this->mInterwiki == '') {
                        $t = $wgContLang->ucfirst( $r );
                } else {
                        $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 );
@@ -1125,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
@@ -1140,16 +1378,21 @@ class Title {
                } else {
                        $db =& wfGetDB( DB_SLAVE );
                }
-               $cur = $db->tableName( 'cur' );
-               $links = $db->tableName( 'links' );
-
-               $sql = "SELECT cur_namespace,cur_title,cur_id FROM $cur,$links WHERE l_from=cur_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->cur_namespace, $row->cur_title ) ) {
-                                       $wgLinkCache->addGoodLink( $row->cur_id, $titleObj->getPrefixedDBkey() );
+                               if ( $titleObj = Title::makeTitle( $row->page_namespace, $row->page_title ) ) {
+                                       $wgLinkCache->addGoodLinkObj( $row->page_id, $titleObj );
                                        $retVal[] = $titleObj;
                                }
                        }
@@ -1159,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 ) {
@@ -1174,25 +1416,32 @@ class Title {
                } else {
                        $db =& wfGetDB( DB_SLAVE );
                }
-               $cur = $db->tableName( 'cur' );
-               $brokenlinks = $db->tableName( 'brokenlinks' );
-               $encTitle = $db->strencode( $this->getPrefixedDBkey() );
-
-               $sql = "SELECT cur_namespace,cur_title,cur_id FROM $brokenlinks,$cur " .
-                 "WHERE bl_from=cur_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->cur_namespace, $row->cur_title );
-                               $wgLinkCache->addGoodLink( $row->cur_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
@@ -1217,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();
@@ -1236,17 +1494,15 @@ 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';
                }
 
-               if ( $auth && ( !$this->userCanEdit() || !$nt->userCanEdit() ) ) {
+               if ( $auth && (
+                               !$this->userCanEdit() || !$nt->userCanEdit() ||
+                               !$this->userCanMove() || !$nt->userCanMove() ) ) {
                        return 'protectedpage';
                }
                
@@ -1258,15 +1514,34 @@ 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
                
                $dbw =& wfGetDB( DB_MASTER );
-               $sql = "UPDATE categorylinks SET cl_sortkey=" . $dbw->addQuotes( $nt->getPrefixedText() ) .
+               $categorylinks = $dbw->tableName( 'categorylinks' );
+               $sql = "UPDATE $categorylinks SET cl_sortkey=" . $dbw->addQuotes( $nt->getPrefixedText() ) .
                        " WHERE cl_from=" . $dbw->addQuotes( $this->getArticleID() ) .
                        " AND cl_sortkey=" . $dbw->addQuotes( $this->getPrefixedText() );
                $dbw->query( $sql, 'SpecialMovepage::doSubmit' );
@@ -1288,6 +1563,7 @@ class Title {
                $u = new SearchUpdate( $newid, $this->getPrefixedDBkey(), '' );
                $u->doUpdate();
 
+               wfRunHooks( 'TitleMoveComplete', array(&$this, &$nt, &$wgUser, $oldid, $newid) );
                return true;
        }
        
@@ -1299,122 +1575,72 @@ class Title {
         *      be a redirect
         * @access private
         */
-       /* private */ function moveOverExistingRedirect( &$nt ) {
+       function moveOverExistingRedirect( &$nt, $reason = '' ) {
                global $wgUser, $wgLinkCache, $wgUseSquid, $wgMwRedir;
                $fname = 'Title::moveOverExistingRedirect';
-               $comment = wfMsg( '1movedto2', $this->getPrefixedText(), $nt->getPrefixedText() );
+               $comment = wfMsgForContent( '1movedto2', $this->getPrefixedText(), $nt->getPrefixedText() );
+
+               if ( $reason ) {
+                       $comment .= ": $reason";
+               }
                
                $now = wfTimestampNow();
-               $won = wfInvertTimestamp( $now );
+               $rand = wfRandom();
                $newid = $nt->getArticleID();
                $oldid = $this->getArticleID();
                $dbw =& wfGetDB( DB_MASTER );
                $links = $dbw->tableName( 'links' );
 
+               # Delete the old redirect. We don't save it to history since
+               # by definition if we've got here it's rather uninteresting.
+               # We have to remove it so that the next step doesn't trigger
+               # 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->updateArray( 'cur',
+               $dbw->update( 'page',
                        /* SET */ array( 
-                               'cur_touched' => $dbw->timestamp($now), 
-                               'cur_namespace' => $nt->getNamespace(),
-                               'cur_title' => $nt->getDBkey()
+                               'page_touched'   => $dbw->timestamp($now), 
+                               'page_namespace' => $nt->getNamespace(),
+                               'page_title'     => $nt->getDBkey(),
+                               'page_latest'    => $nullRevId,
                        ), 
-                       /* WHERE */ array( 'cur_id' => $oldid ),
+                       /* WHERE */ array( 'page_id' => $oldid ),
                        $fname
                );
                $wgLinkCache->clearLink( $nt->getPrefixedDBkey() );
 
-               # Repurpose the old redirect. We don't save it to history since
-               # by definition if we've got here it's rather uninteresting.
-               
+               # Recreate the redirect, this time in the other direction.
                $redirectText = $wgMwRedir->getSynonym( 0 ) . ' [[' . $nt->getPrefixedText() . "]]\n";
-               $dbw->updateArray( 'cur',
-                       /* SET */ array(
-                               'cur_touched' => $dbw->timestamp($now),
-                               'cur_timestamp' => $dbw->timestamp($now),
-                               'inverse_timestamp' => $won,
-                               'cur_namespace' => $this->getNamespace(),
-                               'cur_title' => $this->getDBkey(),
-                               'cur_text' => $wgMwRedir->getSynonym( 0 ) . ' [[' . $nt->getPrefixedText() . "]]\n",
-                               'cur_comment' => $comment,
-                               'cur_user' => $wgUser->getID(),
-                               'cur_minor_edit' => 0,
-                               'cur_counter' => 0,
-                               'cur_restrictions' => '',
-                               'cur_user_text' => $wgUser->getName(),
-                               'cur_is_redirect' => 1,
-                               'cur_is_new' => 1
-                       ),
-                       /* WHERE */ array( 'cur_id' => $newid ),
-                       $fname
-               );
-               
+               $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() );
 
-               # Fix the redundant names for the past revisions of the target page.
-               # The redirect should have no old revisions.
-               $dbw->updateArray(
-                       /* table */ 'old',
-                       /* SET */ array( 
-                               'old_namespace' => $nt->getNamespace(),
-                               'old_title' => $nt->getDBkey(),
-                       ),
-                       /* WHERE */ array( 
-                               'old_namespace' => $this->getNamespace(),
-                               'old_title' => $this->getDBkey(),
-                       ),
-                       $fname
-               );
-               
-               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->insertArray( '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 ) {
@@ -1430,81 +1656,72 @@ 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 = wfMsg( '1movedto2', $this->getPrefixedText(), $nt->getPrefixedText() );
+               $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->updateArray( 'cur',
+               $dbw->update( 'page',
                        /* SET */ array(
-                               'cur_touched' => $now,
-                               'cur_namespace' => $nt->getNamespace(),
-                               'cur_title' => $nt->getDBkey()
+                               'page_touched'   => $now,
+                               'page_namespace' => $nt->getNamespace(),
+                               'page_title'     => $nt->getDBkey(),
+                               'page_latest'    => $nullRevId,
                        ),
-                       /* WHERE */ array( 'cur_id' => $oldid ),
+                       /* WHERE */ array( 'page_id' => $oldid ),
                        $fname
                );
                
                $wgLinkCache->clearLink( $nt->getPrefixedDBkey() );
 
                # Insert redirect
-               $dbw->insertArray( 'cur', array(
-                       'cur_id' => $dbw->nextSequenceValue('cur_cur_id_seq'),
-                       'cur_namespace' => $this->getNamespace(),
-                       'cur_title' => $this->getDBkey(),
-                       'cur_comment' => $comment,
-                       'cur_user' => $wgUser->getID(),
-                       'cur_user_text' => $wgUser->getName(),
-                       'cur_timestamp' => $now,
-                       'inverse_timestamp' => $won,
-                       'cur_touched' => $now,
-                       'cur_is_redirect' => 1,
-                       'cur_random' => $rand,
-                       'cur_is_new' => 1,
-                       'cur_text' => "#REDIRECT [[" . $nt->getPrefixedText() . "]]\n" ), $fname
-               );
-               $newid = $dbw->insertId();
+               $redirectText = $wgMwRedir->getSynonym( 0 ) . ' [[' . $nt->getPrefixedText() . "]]\n";
+               $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() );
 
-               # Rename old entries
-               $dbw->updateArray( 
-                       /* table */ 'old',
-                       /* SET */ array(
-                               'old_namespace' => $nt->getNamespace(),
-                               'old_title' => $nt->getDBkey()
-                       ),
-                       /* WHERE */ array(
-                               'old_namespace' => $this->getNamespace(),
-                               'old_title' => $this->getDBkey()
-                       ), $fname
-               );
-               
-               # 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->updateArray( 'links', array( 'l_to' => $newid ), array( 'l_to' => $oldid ), $fname );
-               LinkCache::linksccClearLinksTo( $oldid );
-
                # Record the just-created redirect's linking to the page
-               $dbw->insertArray( '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()
@@ -1527,21 +1744,24 @@ class Title {
         * @access public
         */
        function isValidMoveTarget( $nt ) {
+               
                $fname = 'Title::isValidMoveTarget';
                $dbw =& wfGetDB( DB_MASTER );
 
                # Is it a redirect?
                $id  = $nt->getArticleID();
-               $obj = $dbw->getArray( 'cur', array( 'cur_is_redirect','cur_text' ), 
-                       array( 'cur_id' => $id ), $fname, 'FOR UPDATE' );
+               $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->cur_is_redirect ) { 
+               if ( !$obj || 0 == $obj->page_is_redirect ) { 
                        # Not a redirect
                        return false; 
                }
 
                # Does the redirect point to the source?
-               if ( preg_match( "/\\[\\[\\s*([^\\]\\|]*)]]/", $obj->cur_text, $m ) ) {
+               if ( preg_match( "/\\[\\[\\s*([^\\]\\|]*)]]/", $obj->old_text, $m ) ) {
                        $redirTitle = Title::newFromText( $m[1] );
                        if( !is_object( $redirTitle ) ||
                                $redirTitle->getPrefixedDBkey() != $this->getPrefixedDBkey() ) {
@@ -1550,10 +1770,11 @@ class Title {
                }
 
                # Does the article have a history?
-               $row = $dbw->getArray( 'old', array( 'old_id' ), 
-                       array( 
-                               'old_namespace' => $nt->getNamespace(),
-                               'old_title' => $nt->getDBkey() 
+               $row = $dbw->selectRow( array( 'page', 'revision'),
+                       array( 'rev_id' ), 
+                       array( 'page_namespace' => $nt->getNamespace(),
+                               'page_title' => $nt->getDBkey(),
+                               'page_id=rev_page AND page_latest != rev_id'
                        ), $fname, 'FOR UPDATE' 
                );
 
@@ -1578,43 +1799,25 @@ class Title {
                
                $fname = 'Title::createRedirect';
                $dbw =& wfGetDB( DB_MASTER );
-               $now = wfTimestampNow();
-               $won = wfInvertTimestamp( $now );
-               $seqVal = $dbw->nextSequenceValue( 'cur_cur_id_seq' );
-
-               $dbw->insertArray( 'cur', array(
-                       'cur_id' => $seqVal,
-                       'cur_namespace' => $this->getNamespace(),
-                       'cur_title' => $this->getDBkey(),
-                       'cur_comment' => $comment,
-                       'cur_user' => $wgUser->getID(),
-                       'cur_user_text' => $wgUser->getName(),
-                       'cur_timestamp' => $now,
-                       'inverse_timestamp' => $won,
-                       'cur_touched' => $now,
-                       'cur_is_redirect' => 1,
-                       'cur_is_new' => 1,
-                       'cur_text' => "#REDIRECT [[" . $dest->getPrefixedText() . "]]\n" 
-               ), $fname );
-               $newid = $dbw->insertId();
-               $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->insertArray( 'links', 
-                               array(
-                                       'l_to' => $dest->getArticleID(),
-                                       'l_from' => $newid
-                               ), $fname 
-                       );
-               } else {
-                       $dbw->insertArray( '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;
@@ -1635,11 +1838,10 @@ class Title {
                $sk =& $wgUser->getSkin();
                $parents = array();
                $dbr =& wfGetDB( DB_SLAVE );
-               $cur = $dbr->tableName( 'cur' );
                $categorylinks = $dbr->tableName( 'categorylinks' );
 
                # NEW SQL
-               $sql = "SELECT * FROM categorylinks"
+               $sql = "SELECT * FROM $categorylinks"
                     ." WHERE cl_from='$titlekey'"
                         ." AND cl_from <> '0'"
                         ." ORDER BY cl_sortkey";
@@ -1658,18 +1860,24 @@ class Title {
        }
 
        /**
-        * Go through all parent categories of this Title
+        * Get a tree of parent categories
+        * @param array $children an array with the children in the keys, to check for circular refs
         * @return array
         * @access public
         */
-       function getCategorieBrowser() {
+       function getParentCategoryTree( $children = array() ) {
                $parents = $this->getParentCategories();
                
                if($parents != '') {
                        foreach($parents as $parent => $current)
                        {
-                               $nt = Title::newFromText($parent);
-                               $stack[$parent] = $nt->getCategorieBrowser();
+                               if ( array_key_exists( $parent, $children ) ) {
+                                       # Circular reference
+                                       $stack[$parent] = array();
+                               } else {
+                                       $nt = Title::newFromText($parent);
+                                       $stack[$parent] = $nt->getParentCategoryTree( $children + array($parent => 1) );
+                               }
                        }
                        return $stack;
                } else {
@@ -1686,6 +1894,7 @@ class Title {
         * @access public
         */
        function curCond() {
+               wfDebugDieBacktrace( 'curCond called' );
                return array( 'cur_namespace' => $this->mNamespace, 'cur_title' => $this->mDbkeyform );
        }
 
@@ -1697,6 +1906,7 @@ class Title {
         * @access public
         */
        function oldCond() {
+               wfDebugDieBacktrace( 'oldCond called' );
                return array( 'old_namespace' => $this->mNamespace, 'old_title' => $this->mDbkeyform );
        }
 
@@ -1708,10 +1918,9 @@ class Title {
         */
        function getPreviousRevisionID( $revision ) {
                $dbr =& wfGetDB( DB_SLAVE );
-               return $dbr->selectField( 'old', 'old_id',
-                       'old_title=' . $dbr->addQuotes( $this->getDBkey() ) .
-                       ' AND old_namespace=' . IntVal( $this->getNamespace() ) .
-                       ' AND old_id<' . IntVal( $revision ) . ' ORDER BY old_id DESC' );
+               return $dbr->selectField( 'revision', 'rev_id',
+                       'rev_page=' . IntVal( $this->getArticleId() ) .
+                       ' AND rev_id<' . IntVal( $revision ) . ' ORDER BY rev_id DESC' );
        }
 
        /**
@@ -1722,11 +1931,73 @@ class Title {
         */
        function getNextRevisionID( $revision ) {
                $dbr =& wfGetDB( DB_SLAVE );
-               return $dbr->selectField( 'old', 'old_id',
-                       'old_title=' . $dbr->addQuotes( $this->getDBkey() ) .
-                       ' AND old_namespace=' . IntVal( $this->getNamespace() ) .
-                       ' AND old_id>' . IntVal( $revision ) . ' ORDER BY old_id' );
+               return $dbr->selectField( 'revision', 'rev_id',
+                       '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);
+       }
 }
 ?>