follow-up r59522, r59523, r59527, r59529, r59530.
[lhc/web/wiklou.git] / includes / Title.php
index cad93f9..939d92e 100644 (file)
@@ -152,6 +152,14 @@ class Title {
        }
 
        /**
+        * THIS IS NOT THE FUNCTION YOU WANT. Use Title::newFromText().
+        *
+        * Example of wrong and broken code:
+        * $title = Title::newFromURL( $wgRequest->getVal( 'title' ) );
+        *
+        * Example of right code:
+        * $title = Title::newFromText( $wgRequest->getVal( 'title' ) );
+        *
         * Create a new Title from URL-encoded text. Ensures that
         * the given title's length does not exceed the maximum.
         * @param $url \type{\string} the title, as might be taken from a URL
@@ -179,20 +187,15 @@ 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
-        *
         * @param $id \type{\int} the page_id corresponding to the Title to create
         * @param $flags \type{\int} use GAID_FOR_UPDATE to use master
         * @return \type{Title} the new object, or NULL on an error
         */
        public static function newFromID( $id, $flags = 0 ) {
-               $fname = 'Title::newFromID';
                $db = ($flags & GAID_FOR_UPDATE) ? wfGetDB( DB_MASTER ) : wfGetDB( DB_SLAVE );
-               $row = $db->selectRow( 'page', array( 'page_namespace', 'page_title' ),
-                       array( 'page_id' => $id ), $fname );
-               if ( $row !== false ) {
-                       $title = Title::makeTitle( $row->page_namespace, $row->page_title );
+               $row = $db->selectRow( 'page', '*', array( 'page_id' => $id ), __METHOD__ );
+               if( $row !== false ) {
+                       $title = Title::newFromRow( $row );
                } else {
                        $title = NULL;
                }
@@ -339,7 +342,7 @@ class Title {
                // recursive check to follow double redirects
                $recurse = $wgMaxRedirects;
                $titles = array( $title );
-               while( --$recurse >= 0 ) {
+               while( --$recurse > 0 ) {
                        if( $title->isRedirect() ) {
                                $article = new Article( $title, 0 );
                                $newtitle = $article->getRedirectTarget();
@@ -454,7 +457,7 @@ class Title {
                return trim( $t );
        }
 
-       /*
+       /**
         * Make a prefixed DB key from a DB key and a namespace index
         * @param $ns \type{\int} numerical representation of the namespace
         * @param $title \type{\string} the DB key form the title
@@ -472,18 +475,6 @@ class Title {
                return $name;
        }
 
-       /**
-        * Returns the URL associated with an interwiki prefix
-        * @param $key \type{\string} the interwiki prefix (e.g. "MeatBall")
-        * @return \type{\string} the associated URL, containing "$1", 
-        *      which should be replaced by an article title
-        * @static (arguably)
-        * @deprecated See Interwiki class
-        */
-       public function getInterwikiLink( $key )  {
-               return Interwiki::fetch( $key )->getURL( );
-       }
-
        /**
         * Determine whether the object refers to a page within
         * this project.
@@ -555,7 +546,7 @@ class Title {
         * @return \type{\string} Namespace text
         */
        public function getNsText() {
-               global $wgContLang, $wgCanonicalNamespaceNames;
+               global $wgContLang;
 
                if ( '' != $this->mInterwiki ) {
                        // This probably shouldn't even happen. ohh man, oh yuck.
@@ -564,8 +555,8 @@ class Title {
                        //
                        // Use the canonical namespaces if possible to try to
                        // resolve a foreign namespace.
-                       if( isset( $wgCanonicalNamespaceNames[$this->mNamespace] ) ) {
-                               return $wgCanonicalNamespaceNames[$this->mNamespace];
+                       if( MWNamespace::exists( $this->mNamespace ) ) {
+                               return MWNamespace::getCanonicalName( $this->mNamespace );
                        }
                }
                return $wgContLang->getNsText( $this->mNamespace );
@@ -742,7 +733,7 @@ class Title {
 
                $interwiki = Interwiki::fetch( $this->mInterwiki );
                if ( !$interwiki ) {
-                       $url = $this->getLocalUrl( $query, $variant );
+                       $url = $this->getLocalURL( $query, $variant );
 
                        // Ugly quick hack to avoid duplicate prefixes (bug 4571 etc)
                        // Correct fix would be to move the prepending elsewhere.
@@ -859,6 +850,9 @@ class Title {
         * there's a fragment but the prefixed text is empty, we just return a link
         * to the fragment.
         *
+        * The result obviously should not be URL-escaped, but does need to be
+        * HTML-escaped if it's being output in HTML.
+        *
         * @param $query \type{\arrayof{\string}} An associative array of key => value pairs for the
         *   query string.  Keys and values will be escaped.
         * @param $variant \type{\string} Language variant of URL (for sr, zh..).  Ignored
@@ -867,19 +861,16 @@ class Title {
         * @return \type{\string} the URL
         */
        public function getLinkUrl( $query = array(), $variant = false ) {
-               if( !is_array( $query ) ) {
-                       throw new MWException( 'Title::getLinkUrl passed a non-array for '.
-                       '$query' );
-               }
+               wfProfileIn( __METHOD__ );
                if( $this->isExternal() ) {
-                       return $this->getFullURL( $query );
-               } elseif( $this->getPrefixedText() === ''
-               and $this->getFragment() !== '' ) {
-                       return $this->getFragmentForURL();
+                       $ret = $this->getFullURL( $query );
+               } elseif( $this->getPrefixedText() === '' && $this->getFragment() !== '' ) {
+                       $ret = $this->getFragmentForURL();
                } else {
-                       return $this->getLocalURL( $query, $variant )
-                               . $this->getFragmentForURL();
+                       $ret = $this->getLocalURL( $query, $variant ) . $this->getFragmentForURL();
                }
+               wfProfileOut( __METHOD__ );
+               return $ret;
        }
 
        /**
@@ -974,18 +965,20 @@ class Title {
        /**
         * Does the title correspond to a protected article?
         * @param $what \type{\string} the action the page is protected from,
-        * by default checks move and edit
+        * by default checks all actions.
         * @return \type{\bool}
         */
        public function isProtected( $action = '' ) {
-               global $wgRestrictionLevels, $wgRestrictionTypes;
+               global $wgRestrictionLevels;
+               
+               $restrictionTypes = $this->getRestrictionTypes();
 
                # Special pages have inherent protection
                if( $this->getNamespace() == NS_SPECIAL )
                        return true;
 
                # Check regular protection levels
-               foreach( $wgRestrictionTypes as $type ){
+               foreach( $restrictionTypes as $type ){
                        if( $action == $type || $action == '' ) {
                                $r = $this->getRestrictions( $type );
                                foreach( $wgRestrictionLevels as $level ) {
@@ -1018,7 +1011,8 @@ class Title {
 
        /**
         * Can $wgUser perform $action on this page?
-        * This skips potentially expensive cascading permission checks.
+        * This skips potentially expensive cascading permission checks
+        * as well as avoids expensive error formatting
         *
         * Suitable for use for nonessential UI controls in common cases, but
         * _not_ for functional access control.
@@ -1183,7 +1177,21 @@ class Title {
                        
                        if( !$user->isAllowed( 'move' ) ) {
                                // User can't move anything
-                               $errors[] = $user->isAnon() ? array ( 'movenologintext' ) : array ('movenotallowed');
+                               global $wgGroupPermissions;
+                               $userCanMove = false;
+                               if ( isset( $wgGroupPermissions['user']['move'] ) ) {
+                                       $userCanMove = $wgGroupPermissions['user']['move'];
+                               }
+                               $autoconfirmedCanMove = false;
+                               if ( isset( $wgGroupPermissions['autoconfirmed']['move'] ) ) {
+                                       $autoconfirmedCanMove = $wgGroupPermissions['autoconfirmed']['move'];
+                               }
+                               if ( $user->isAnon() && ( $userCanMove || $autoconfirmedCanMove ) ) {
+                                       // custom message if logged-in users without any special rights can move
+                                       $errors[] = array ( 'movenologintext' );
+                               } else {
+                                       $errors[] = array ('movenotallowed');
+                               }
                        }
                } elseif ( $action == 'create' ) {
                        if( ( $this->isTalkPage() && !$user->isAllowed( 'createtalk' ) ) ||
@@ -1194,7 +1202,7 @@ class Title {
                } elseif( $action == 'move-target' ) {
                        if( !$user->isAllowed( 'move' ) ) {
                                // User can't move anything
-                               $errors[] = $user->isAnon() ? array ( 'movenologintext' ) : array ('movenotallowed');
+                               $errors[] = array ('movenotallowed');
                        } elseif( !$user->isAllowed( 'move-rootuserpages' )
                                && $this->getNamespace() == NS_USER && !$this->isSubpage() )
                        {
@@ -1203,8 +1211,14 @@ class Title {
                        }
                } elseif( !$user->isAllowed( $action ) ) {
                        $return = null;
-                       $groups = array_map( array( 'User', 'makeGroupLinkWiki' ),
-                               User::getGroupsWithPermission( $action ) );
+                       
+                       // We avoid expensive display logic for quickUserCan's and such
+                       $groups = false; 
+                       if (!$short) {
+                               $groups = array_map( array( 'User', 'makeGroupLinkWiki' ),
+                                       User::getGroupsWithPermission( $action ) );
+                       } 
+                       
                        if( $groups ) {
                                $return = array( 'badaccess-groups',
                                        array( implode( ', ', $groups ), count( $groups ) ) );
@@ -1275,8 +1289,16 @@ class Title {
 
                # 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( $this->isCssJsSubpage() && !$user->isAllowed('editusercssjs')
+               # XXX: Find a way to work around the php bug that prevents using $this->userCanEditCssSubpage() 
+               #      and $this->userCanEditJsSubpage() from working
+               # XXX: right 'editusercssjs' is deprecated, for backward compatibility only
+               if( $this->isCssSubpage() && !( $user->isAllowed('editusercssjs') || $user->isAllowed('editusercss') )
+                       && $action != 'patrol'
+                       && !preg_match('/^'.preg_quote($user->getName(), '/').'\//', $this->mTextform) )
+               {
+                       $errors[] = array('customcssjsprotected');
+               } else if( $this->isJsSubpage() && !( $user->isAllowed('editusercssjs') || $user->isAllowed('edituserjs') )
+                       && $action != 'patrol'
                        && !preg_match('/^'.preg_quote($user->getName(), '/').'\//', $this->mTextform) )
                {
                        $errors[] = array('customcssjsprotected');
@@ -1385,6 +1407,11 @@ class Title {
                if ( $this->getNamespace() < 0 ) {
                        return false;
                }
+               
+               // Can't protect pages that exist.
+               if ($this->exists()) {
+                       return false;
+               }
 
                $dbr = wfGetDB( DB_SLAVE );
                $res = $dbr->select( 'protected_titles', '*',
@@ -1421,7 +1448,8 @@ class Title {
 
                $expiry_description = '';
                if ( $encodedExpiry != 'infinity' ) {
-                       $expiry_description = ' (' . wfMsgForContent( 'protect-expiring', $wgContLang->timeanddate( $expiry ) , $wgContLang->date( $expiry ) , $wgContLang->time( $expiry ) ).')';
+                       $expiry_description = ' (' . wfMsgForContent( 'protect-expiring',$wgContLang->timeanddate( $expiry ),
+                               $wgContLang->date( $expiry ) , $wgContLang->time( $expiry ) ).')';
                }
                else {
                        $expiry_description .= ' (' . wfMsgForContent( 'protect-expiry-indefinite' ).')';
@@ -1430,23 +1458,30 @@ class Title {
                # Update protection table
                if ($create_perm != '' ) {
                        $dbw->replace( 'protected_titles', array(array('pt_namespace', 'pt_title')),
-                               array( 'pt_namespace' => $namespace, 'pt_title' => $title
-                                       , 'pt_create_perm' => $create_perm
-                                       , 'pt_timestamp' => Block::encodeExpiry(wfTimestampNow(), $dbw)
-                                       , 'pt_expiry' => $encodedExpiry
-                                       , 'pt_user' => $wgUser->getId(), 'pt_reason' => $reason ), __METHOD__  );
+                               array(
+                                       'pt_namespace' => $namespace,
+                                       'pt_title' => $title,
+                                       'pt_create_perm' => $create_perm,
+                                       'pt_timestamp' => Block::encodeExpiry(wfTimestampNow(), $dbw),
+                                       'pt_expiry' => $encodedExpiry,
+                                       'pt_user' => $wgUser->getId(),
+                                       'pt_reason' => $reason,
+                               ), __METHOD__
+                       );
                } else {
                        $dbw->delete( 'protected_titles', array( 'pt_namespace' => $namespace,
                                'pt_title' => $title ), __METHOD__ );
                }
                # Update the protection log
-               $log = new LogPage( 'protect' );
+               if( $dbw->affectedRows() ) {
+                       $log = new LogPage( 'protect' );
 
-               if( $create_perm ) {
-                       $params = array("[create=$create_perm] $expiry_description",'');
-                       $log->addEntry( $this->mRestrictions['create'] ? 'modify' : 'protect', $this, trim( $reason ), $params );
-               } else {
-                       $log->addEntry( 'unprotect', $this, $reason );
+                       if( $create_perm ) {
+                               $params = array("[create=$create_perm] $expiry_description",'');
+                               $log->addEntry( ( isset( $this->mRestrictions['create'] ) && $this->mRestrictions['create'] ) ? 'modify' : 'protect', $this, trim( $reason ), $params );
+                       } else {
+                               $log->addEntry( 'unprotect', $this, $reason );
+                       }
                }
 
                return true;
@@ -1463,33 +1498,6 @@ class Title {
                        __METHOD__ );
        }
 
-       /**
-        * Can $wgUser edit this page?
-        * @return \type{\bool} TRUE or FALSE
-        * @deprecated use userCan('edit')
-        */
-       public function userCanEdit( $doExpensiveQueries = true ) {
-               return $this->userCan( 'edit', $doExpensiveQueries );
-       }
-
-       /**
-        * Can $wgUser create this page?
-        * @return \type{\bool} TRUE or FALSE
-        * @deprecated use userCan('create')
-        */
-       public function userCanCreate( $doExpensiveQueries = true ) {
-               return $this->userCan( 'create', $doExpensiveQueries );
-       }
-
-       /**
-        * Can $wgUser move this page?
-        * @return \type{\bool} TRUE or FALSE
-        * @deprecated use userCan('move')
-        */
-       public function userCanMove( $doExpensiveQueries = true ) {
-               return $this->userCan( 'move', $doExpensiveQueries );
-       }
-
        /**
         * Would anybody with sufficient privileges be able to move this page?
         * Some pages just aren't movable.
@@ -1507,7 +1515,33 @@ class Title {
         */
        public function userCanRead() {
                global $wgUser, $wgGroupPermissions;
-
+               
+               static $useShortcut = null;
+
+               # Initialize the $useShortcut boolean, to determine if we can skip quite a bit of code below
+               if( is_null( $useShortcut ) ) {
+                       global $wgRevokePermissions;
+                       $useShortcut = true;
+                       if( empty( $wgGroupPermissions['*']['read'] ) ) {
+                               # Not a public wiki, so no shortcut
+                               $useShortcut = false;
+                       } elseif( !empty( $wgRevokePermissions ) ) {
+                               /*
+                                * Iterate through each group with permissions being revoked (key not included since we don't care
+                                * what the group name is), then check if the read permission is being revoked. If it is, then
+                                * we don't use the shortcut below since the user might not be able to read, even though anon
+                                * reading is allowed.
+                                */
+                               foreach( $wgRevokePermissions as $perms ) {
+                                       if( !empty( $perms['read'] ) ) {
+                                               # We might be removing the read right from the user, so no shortcut
+                                               $useShortcut = false;
+                                               break;
+                                       }
+                               }
+                       }
+               }
+               
                $result = null;
                wfRunHooks( 'userCan', array( &$this, &$wgUser, 'read', &$result ) );
                if ( $result !== null ) {
@@ -1515,7 +1549,7 @@ class Title {
                }
 
                # Shortcut for public wikis, allows skipping quite a bit of code
-               if ( !empty( $wgGroupPermissions['*']['read'] ) )
+               if ( $useShortcut )
                        return true;
 
                if( $wgUser->isAllowed( 'read' ) ) {
@@ -1613,7 +1647,6 @@ class Title {
                        return $this->mHasSubpages;
                }
 
-               $db = wfGetDB( DB_SLAVE );
                $subpages = $this->getSubpages( 1 );
                if( $subpages instanceof TitleArray )
                        return $this->mHasSubpages = (bool)$subpages->count();
@@ -1626,20 +1659,19 @@ class Title {
         * @return mixed TitleArray, or empty array if this page's namespace
         *  doesn't allow subpages
         */
-       public function getSubpages($limit = -1) {
+       public function getSubpages( $limit = -1 ) {
                if( !MWNamespace::hasSubpages( $this->getNamespace() ) )
                        return array();
 
                $dbr = wfGetDB( DB_SLAVE );
                $conds['page_namespace'] = $this->getNamespace();
-               $conds[] = 'page_title LIKE ' . $dbr->addQuotes(
-                               $dbr->escapeLike( $this->getDBkey() ) . '/%' );
+               $conds[] = 'page_title ' . $dbr->buildLike( $this->getDBkey() . '/', $dbr->anyString() );
                $options = array();
                if( $limit > -1 )
                        $options['LIMIT'] = $limit;
                return $this->mSubpages = TitleArray::newFromResult(
                        $dbr->select( 'page',
-                               array( 'page_id', 'page_namespace', 'page_title' ),
+                               array( 'page_id', 'page_namespace', 'page_title', 'page_is_redirect' ),
                                $conds,
                                __METHOD__,
                                $options
@@ -1701,15 +1733,28 @@ class Title {
                return ( NS_USER == $this->mNamespace && preg_match("/\\/.*\\.js$/", $this->mTextform ) );
        }
        /**
-        * Protect css/js subpages of user pages: can $wgUser edit
+        * Protect css subpages of user pages: can $wgUser edit
         * this page?
         *
         * @return \type{\bool} TRUE or FALSE
         * @todo XXX: this might be better using restrictions
         */
-       public function userCanEditCssJsSubpage() {
+       public function userCanEditCssSubpage() {
                global $wgUser;
-               return ( $wgUser->isAllowed('editusercssjs') || preg_match('/^'.preg_quote($wgUser->getName(), '/').'\//', $this->mTextform) );
+               return ( ( $wgUser->isAllowed('editusercssjs') && $wgUser->isAllowed('editusercss') ) 
+                       || preg_match('/^'.preg_quote($wgUser->getName(), '/').'\//', $this->mTextform) );
+       }
+       /**
+        * Protect js subpages of user pages: can $wgUser edit
+        * this page?
+        *
+        * @return \type{\bool} TRUE or FALSE
+        * @todo XXX: this might be better using restrictions
+        */
+       public function userCanEditJsSubpage() {
+               global $wgUser;
+               return ( ( $wgUser->isAllowed('editusercssjs') && $wgUser->isAllowed('edituserjs') )
+                       || preg_match('/^'.preg_quote($wgUser->getName(), '/').'\//', $this->mTextform) );
        }
 
        /**
@@ -1731,12 +1776,7 @@ class Title {
         *         The restriction array is an array of each type, each of which contains an array of unique groups.
         */
        public function getCascadeProtectionSources( $get_pages = true ) {
-               global $wgRestrictionTypes;
-
-               # Define our dimension of restrictions types
                $pagerestrictions = array();
-               foreach( $wgRestrictionTypes as $action )
-                       $pagerestrictions[$action] = array();
 
                if ( isset( $this->mCascadeSources ) && $get_pages ) {
                        return array( $this->mCascadeSources, $this->mCascadingRestrictions );
@@ -1787,7 +1827,13 @@ class Title {
                                        $sources[$page_id] = Title::makeTitle($page_ns, $page_title);
                                        # Add groups needed for each restriction type if its not already there
                                        # Make sure this restriction type still exists
-                                       if ( isset($pagerestrictions[$row->pr_type]) && !in_array($row->pr_level, $pagerestrictions[$row->pr_type]) ) {
+                                       
+                                       if ( !isset( $pagerestrictions[$row->pr_type] ) ) {
+                                               $pagerestrictions[$row->pr_type] = array();
+                                       }
+                                       
+                                       if ( isset($pagerestrictions[$row->pr_type]) &&
+                                                       !in_array($row->pr_level, $pagerestrictions[$row->pr_type]) ) {
                                                $pagerestrictions[$row->pr_type][]=$row->pr_level;
                                        }
                                } else {
@@ -1825,11 +1871,23 @@ class Title {
         * Loads a string into mRestrictions array
         * @param $res \type{Resource} restrictions as an SQL result.
         */
-       private function loadRestrictionsFromRow( $res, $oldFashionedRestrictions = NULL ) {
-               global $wgRestrictionTypes;
+       private function loadRestrictionsFromResultWrapper( $res, $oldFashionedRestrictions = NULL ) {
+               $rows = array();
+               $dbr = wfGetDB( DB_SLAVE );
+               
+               while( $row = $dbr->fetchObject( $res ) ) {
+                       $rows[] = $row;
+               }
+               
+               $this->loadRestrictionsFromRows( $rows, $oldFashionedRestrictions );
+       }
+       
+       public function loadRestrictionsFromRows( $rows, $oldFashionedRestrictions = NULL ) {
                $dbr = wfGetDB( DB_SLAVE );
+               
+               $restrictionTypes = $this->getRestrictionTypes();
 
-               foreach( $wgRestrictionTypes as $type ){
+               foreach( $restrictionTypes as $type ){
                        $this->mRestrictions[$type] = array();
                        $this->mRestrictionsExpiry[$type] = Block::decodeExpiry('');
                }
@@ -1860,16 +1918,17 @@ class Title {
 
                }
 
-               if( $dbr->numRows( $res ) ) {
+               if( count($rows) ) {
                        # Current system - load second to make them override.
                        $now = wfTimestampNow();
                        $purgeExpired = false;
 
-                       foreach( $res as $row ) {
+                       foreach( $rows as $row ) {
                                # Cycle through all the restrictions.
 
-                               // Don't take care of restrictions types that aren't in $wgRestrictionTypes
-                               if( !in_array( $row->pr_type, $wgRestrictionTypes ) )
+                               // Don't take care of restrictions types that aren't allowed
+                               
+                               if( !in_array( $row->pr_type, $restrictionTypes ) )
                                        continue;
 
                                // This code should be refactored, now that it's being used more generally,
@@ -1907,7 +1966,7 @@ class Title {
                                $res = $dbr->select( 'page_restrictions', '*',
                                        array ( 'pr_page' => $this->getArticleId() ), __METHOD__ );
 
-                               $this->loadRestrictionsFromRow( $res, $oldFashionedRestrictions );
+                               $this->loadRestrictionsFromResultWrapper( $res, $oldFashionedRestrictions );
                        } else {
                                $title_protection = $this->getTitleProtection();
 
@@ -1978,20 +2037,45 @@ class Title {
         * @return \type{\int} the number of archived revisions
         */
        public function isDeleted() {
-               $fname = 'Title::isDeleted';
-               if ( $this->getNamespace() < 0 ) {
+               if( $this->getNamespace() < 0 ) {
                        $n = 0;
                } else {
                        $dbr = wfGetDB( DB_SLAVE );
-                       $n = $dbr->selectField( 'archive', 'COUNT(*)', array( 'ar_namespace' => $this->getNamespace(),
-                               'ar_title' => $this->getDBkey() ), $fname );
+                       $n = $dbr->selectField( 'archive', 'COUNT(*)', 
+                               array( 'ar_namespace' => $this->getNamespace(), 'ar_title' => $this->getDBkey() ),
+                               __METHOD__
+                       );
                        if( $this->getNamespace() == NS_FILE ) {
                                $n += $dbr->selectField( 'filearchive', 'COUNT(*)',
-                                       array( 'fa_name' => $this->getDBkey() ), $fname );
+                                       array( 'fa_name' => $this->getDBkey() ),
+                                       __METHOD__
+                               );
                        }
                }
                return (int)$n;
        }
+       
+       /**
+        * Is there a version of this page in the deletion archive?
+        * @return bool
+        */
+       public function isDeletedQuick() {
+               if( $this->getNamespace() < 0 ) {
+                       return false;
+               }
+               $dbr = wfGetDB( DB_SLAVE );
+               $deleted = (bool)$dbr->selectField( 'archive', '1',
+                       array( 'ar_namespace' => $this->getNamespace(), 'ar_title' => $this->getDBkey() ),
+                       __METHOD__
+               );
+               if( !$deleted && $this->getNamespace() == NS_FILE ) {
+                       $deleted = (bool)$dbr->selectField( 'filearchive', '1',
+                               array( 'fa_name' => $this->getDBkey() ),
+                               __METHOD__
+                       );
+               }
+               return $deleted;
+       }
 
        /**
         * Get the article ID for this Title from the link cache,
@@ -2059,7 +2143,7 @@ class Title {
        /**
         * What is the page_latest field for this page?
         * @param $flags \type{\int} a bit field; may be GAID_FOR_UPDATE to select for update
-        * @return \type{\int}
+        * @return \type{\int} or false if the page doesn't exist
         */
        public function getLatestRevID( $flags = 0 ) {
                if( $this->mLatestID !== false )
@@ -2084,8 +2168,8 @@ class Title {
                $linkCache = LinkCache::singleton();
                $linkCache->clearBadLink( $this->getPrefixedDBkey() );
 
-               if ( 0 == $newid ) { $this->mArticleID = -1; }
-               else { $this->mArticleID = $newid; }
+               if ( $newid === false ) { $this->mArticleID = -1; }
+               else { $this->mArticleID = intval( $newid ); }
                $this->mRestrictionsLoaded = false;
                $this->mRestrictions = array();
        }
@@ -2126,21 +2210,11 @@ class Title {
                }
                return $p . $name;
        }
-
-       /**
-        * Secure and split - main initialisation function for this object
-        *
-        * Assumes that mDbkeyform has been set, and is urldecoded
-        * and uses underscores, but not otherwise munged.  This function
-        * removes illegal characters, splits off the interwiki and
-        * namespace prefixes, sets the other forms, and canonicalizes
-        * everything.
-        * @return \type{\bool} true on success
-        */
-       private function secureAndSplit() {
-               global $wgContLang, $wgLocalInterwiki, $wgCapitalLinks;
-
-               # Initialisation
+       
+       // Returns a simple regex that will match on characters and sequences invalid in titles.
+       //  Note that this doesn't pick up many things that could be wrong with titles, but that
+       //  replacing this regex with something valid will make many titles valid.
+       static function getTitleInvalidRegex() {
                static $rxTc = false;
                if( !$rxTc ) {
                        # Matching titles will be held as illegal.
@@ -2156,6 +2230,37 @@ class Title {
                                '|&#x[0-9A-Fa-f]+;' .
                                '/S';
                }
+               
+               return $rxTc;
+       }
+       
+       /**
+        * Capitalize a text if it belongs to a namespace that capitalizes
+        */
+       public static function capitalize( $text, $ns = NS_MAIN ) {
+               global $wgContLang;
+               
+               if ( MWNamespace::isCapitalized( $ns ) )
+                       return $wgContLang->ucfirst( $text );
+               else
+                       return $text;
+       }
+
+       /**
+        * Secure and split - main initialisation function for this object
+        *
+        * Assumes that mDbkeyform has been set, and is urldecoded
+        * and uses underscores, but not otherwise munged.  This function
+        * removes illegal characters, splits off the interwiki and
+        * namespace prefixes, sets the other forms, and canonicalizes
+        * everything.
+        * @return \type{\bool} true on success
+        */
+       private function secureAndSplit() {
+               global $wgContLang, $wgLocalInterwiki;
+
+               # Initialisation
+               $rxTc = self::getTitleInvalidRegex();
 
                $this->mInterwiki = $this->mFragment = '';
                $this->mNamespace = $this->mDefaultNamespace; # Usually NS_MAIN
@@ -2168,8 +2273,11 @@ class Title {
                $dbkey = preg_replace( '/\xE2\x80[\x8E\x8F\xAA-\xAE]/S', '', $dbkey );
 
                # Clean up whitespace
+               # Note: use of the /u option on preg_replace here will cause
+               # input with invalid UTF-8 sequences to be nullified out in PHP 5.2.x,
+               # conveniently disabling them.
                #
-               $dbkey = preg_replace( '/[ _]+/', '_', $dbkey );
+               $dbkey = preg_replace( '/[ _\xA0\x{1680}\x{180E}\x{2000}-\x{200A}\x{2028}\x{2029}\x{202F}\x{205F}\x{3000}]+/u', '_', $dbkey );
                $dbkey = trim( $dbkey, '_' );
 
                if ( '' == $dbkey ) {
@@ -2311,8 +2419,8 @@ class Title {
                 * site might be case-sensitive.
                 */
                $this->mUserCaseDBKey = $dbkey;
-               if( $wgCapitalLinks && $this->mInterwiki == '') {
-                       $dbkey = $wgContLang->ucfirst( $dbkey );
+               if(  $this->mInterwiki == '') {
+                       $dbkey = self::capitalize( $dbkey, $this->mNamespace );
                }
 
                /**
@@ -2575,7 +2683,7 @@ class Title {
                                if( $nt->getText() != wfStripIllegalFilenameChars( $nt->getText() ) ) {
                                        $errors[] = array('imageinvalidfilename');
                                }
-                               if( !File::checkExtensionCompatibility( $file, $nt->getDBKey() ) ) {
+                               if( !File::checkExtensionCompatibility( $file, $nt->getDBkey() ) ) {
                                        $errors[] = array('imagetypemismatch');
                                }
                        }
@@ -2589,7 +2697,7 @@ class Title {
                                $nt->getUserPermissionsErrors('edit', $wgUser) );
                }
 
-               $match = EditPage::matchSpamRegex( $reason );
+               $match = EditPage::matchSummarySpamRegex( $reason );
                if( $match !== false ) {
                        // This is kind of lame, won't display nice
                        $errors[] = array('spamprotectiontext');
@@ -2636,6 +2744,18 @@ class Title {
                        return $err;
                }
 
+               // If it is a file, more it first. It is done before all other moving stuff is done because it's hard to revert
+               $dbw = wfGetDB( DB_MASTER );
+               if( $this->getNamespace() == NS_FILE ) {
+                       $file = wfLocalFile( $this );
+                       if( $file->exists() ) {
+                               $status = $file->move( $nt );
+                               if( !$status->isOk() ) {
+                                       return $status->getErrorsArray();
+                               }
+                       }
+               }
+
                $pageid = $this->getArticleID();
                $protected = $this->isProtected();
                if( $nt->exists() ) {
@@ -2662,7 +2782,6 @@ class Title {
                // we can't actually distinguish it from a default here, and it'll
                // be set to the new title even though it really shouldn't.
                // It'll get corrected on the next edit, but resetting cl_timestamp.
-               $dbw = wfGetDB( DB_MASTER );
                $dbw->update( 'categorylinks',
                        array(
                                'cl_sortkey' => $nt->getPrefixedText(),
@@ -2731,8 +2850,16 @@ class Title {
                # Update message cache for interface messages
                if( $nt->getNamespace() == NS_MEDIAWIKI ) {
                        global $wgMessageCache;
-                       $oldarticle = new Article( $this );
-                       $wgMessageCache->replace( $this->getDBkey(), $oldarticle->getContent() );
+
+                       # @bug 17860: old article can be deleted, if this the case,
+                       # delete it from message cache
+                       if ( $this->getArticleID() === 0 ) {
+                               $wgMessageCache->replace( $this->getDBkey(), false );
+                       } else {
+                               $oldarticle = new Article( $this );
+                               $wgMessageCache->replace( $this->getDBkey(), $oldarticle->getContent() );
+                       }
+
                        $newarticle = new Article( $nt );
                        $wgMessageCache->replace( $nt->getDBkey(), $newarticle->getContent() );
                }
@@ -2754,11 +2881,11 @@ class Title {
         */
        private function moveOverExistingRedirect( &$nt, $reason = '', $createRedirect = true ) {
                global $wgUseSquid, $wgUser;
-               $fname = 'Title::moveOverExistingRedirect';
+
                $comment = wfMsgForContent( '1movedto2_redir', $this->getPrefixedText(), $nt->getPrefixedText() );
 
                if ( $reason ) {
-                       $comment .= ": $reason";
+                       $comment .= wfMsgForContent( 'colon-separator' ) . $reason;
                }
 
                $now = wfTimestampNow();
@@ -2768,11 +2895,15 @@ class Title {
 
                $dbw = wfGetDB( DB_MASTER );
 
+               $rcts = $dbw->timestamp( $nt->getEarliestRevTime() );
+               $newns = $nt->getNamespace();
+               $newdbk = $nt->getDBkey();
+
                # 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 );
+               $dbw->delete( 'page', array( 'page_id' => $newid ), __METHOD__ );
                if ( !$dbw->cascadingDeletes() ) {
                        $dbw->delete( 'revision', array( 'rev_page' => $newid ), __METHOD__ );
                        global $wgUseTrackbacks;
@@ -2786,6 +2917,11 @@ class Title {
                        $dbw->delete( 'langlinks', array( 'll_from' => $newid ), __METHOD__ );
                        $dbw->delete( 'redirect', array( 'rd_from' => $newid ), __METHOD__ );
                }
+               // If the redirect was recently created, it may have an entry in recentchanges still    
+               $dbw->delete( 'recentchanges', 
+                       array( 'rc_timestamp' => $rcts, 'rc_namespace' => $newns, 'rc_title' => $newdbk, 'rc_new' => 1 ), 
+                       __METHOD__
+               );
 
                # Save a null revision in the page's history notifying of the move
                $nullRevision = Revision::newNullRevision( $dbw, $oldid, $comment, true );
@@ -2803,7 +2939,7 @@ class Title {
                                'page_latest'    => $nullRevId,
                        ),
                        /* WHERE */ array( 'page_id' => $oldid ),
-                       $fname
+                       __METHOD__
                );
                $nt->resetArticleID( $oldid );
 
@@ -2824,31 +2960,19 @@ class Title {
 
                        # Now, we record the link from the redirect to the new title.
                        # It should have no other outgoing links...
-                       $dbw->delete( 'pagelinks', array( 'pl_from' => $newid ), $fname );
+                       $dbw->delete( 'pagelinks', array( 'pl_from' => $newid ), __METHOD__ );
                        $dbw->insert( 'pagelinks',
                                array(
                                        'pl_from'      => $newid,
                                        'pl_namespace' => $nt->getNamespace(),
                                        'pl_title'     => $nt->getDBkey() ),
-                               $fname );
+                               __METHOD__ );
                        $redirectSuppressed = false;
                } else {
                        $this->resetArticleID( 0 );
                        $redirectSuppressed = true;
                }
 
-               # Move an image if this is a file
-               if( $this->getNamespace() == NS_FILE ) {
-                       $file = wfLocalFile( $this );
-                       if( $file->exists() ) {
-                               $status = $file->move( $nt );
-                               if( !$status->isOk() ) {
-                                       $dbw->rollback();
-                                       return $status->getErrorsArray();
-                               }
-                       }
-               }
-
                # Log the move
                $log = new LogPage( 'move' );
                $log->addEntry( 'move_redir', $this, $reason, array( 1 => $nt->getPrefixedText(), 2 => $redirectSuppressed ) );
@@ -2871,7 +2995,7 @@ class Title {
         */
        private function moveToNewTitle( &$nt, $reason = '', $createRedirect = true ) {
                global $wgUseSquid, $wgUser;
-               $fname = 'MovePageForm::moveToNewTitle';
+
                $comment = wfMsgForContent( '1movedto2', $this->getPrefixedText(), $nt->getPrefixedText() );
                if ( $reason ) {
                        $comment .= wfMsgExt( 'colon-separator',
@@ -2888,6 +3012,9 @@ class Title {
 
                # Save a null revision in the page's history notifying of the move
                $nullRevision = Revision::newNullRevision( $dbw, $oldid, $comment, true );
+               if ( !is_object( $nullRevision ) ) {
+                       throw new MWException( 'No valid null revision produced in ' . __METHOD__ );
+               }
                $nullRevId = $nullRevision->insertOn( $dbw );
                
                $article = new Article( $this );
@@ -2902,7 +3029,7 @@ class Title {
                                'page_latest'    => $nullRevId,
                        ),
                        /* WHERE */ array( 'page_id' => $oldid ),
-                       $fname
+                       __METHOD__
                );
                $nt->resetArticleID( $oldid );
 
@@ -2927,25 +3054,13 @@ class Title {
                                        'pl_from'      => $newid,
                                        'pl_namespace' => $nt->getNamespace(),
                                        'pl_title'     => $nt->getDBkey() ),
-                               $fname );
+                               __METHOD__ );
                        $redirectSuppressed = false;
                } else {
                        $this->resetArticleID( 0 );
                        $redirectSuppressed = true;
                }
 
-               # Move an image if this is a file
-               if( $this->getNamespace() == NS_FILE ) {
-                       $file = wfLocalFile( $this );
-                       if( $file->exists() ) {
-                               $status = $file->move( $nt );
-                               if( !$status->isOk() ) {
-                                       $dbw->rollback();
-                                       return $status->getErrorsArray();
-                               }
-                       }
-               }
-
                # Log the move
                $log = new LogPage( 'move' );
                $log->addEntry( 'move', $this, $reason, array( 1 => $nt->getPrefixedText(), 2 => $redirectSuppressed ) );
@@ -2970,7 +3085,7 @@ class Title {
         *  arrays (errors) as values, or an error array with numeric indices if no pages were moved
         */
        public function moveSubpages( $nt, $auth = true, $reason = '', $createRedirect = true ) {
-               global $wgUser, $wgMaximumMovedPages;
+               global $wgMaximumMovedPages;
                // Check permissions
                if( !$this->userCan( 'move-subpages' ) )
                        return array( 'cant-move-subpages' );
@@ -2994,13 +3109,18 @@ class Title {
                                break;
                        }
 
-                       if( $oldSubpage->getArticleId() == $this->getArticleId() )
+                       // We don't know whether this function was called before
+                       // or after moving the root page, so check both
+                       // $this and $nt
+                       if( $oldSubpage->getArticleId() == $this->getArticleId() ||
+                                       $oldSubpage->getArticleID() == $nt->getArticleId() )
                                // When moving a page to a subpage of itself,
                                // don't move it twice
                                continue;
                        $newPageName = preg_replace(
-                                       '#^'.preg_quote( $this->getDBKey(), '#' ).'#',
-                                       $nt->getDBKey(), $oldSubpage->getDBKey() );
+                                       '#^'.preg_quote( $this->getDBkey(), '#' ).'#',
+                                       str_replace( '\\', '\\\\', $nt->getDBkey() ), # bug 21234
+                                       $oldSubpage->getDBkey() );
                        if( $oldSubpage->isTalkPage() ) {
                                $newNs = $nt->getTalkPage()->getNamespace();
                        } else {
@@ -3283,12 +3403,12 @@ class Title {
         */
        public function countRevisionsBetween( $old, $new ) {
                $dbr = wfGetDB( DB_SLAVE );
-               return $dbr->selectField( 'revision', 'count(*)',
+               return (int)$dbr->selectField( 'revision', 'count(*)',
                        'rev_page = ' . intval( $this->getArticleId() ) .
                        ' AND rev_id > ' . intval( $old ) .
                        ' AND rev_id < ' . intval( $new ),
-                       __METHOD__,
-                       array( 'USE INDEX' => 'PRIMARY' ) );
+                       __METHOD__
+               );
        }
 
        /**
@@ -3307,7 +3427,7 @@ class Title {
        /**
         * Callback for usort() to do title sorts by (namespace, title)
         */
-       static function compare( $a, $b ) {
+       public static function compare( $a, $b ) {
                if( $a->getNamespace() == $b->getNamespace() ) {
                        return strcmp( $a->getText(), $b->getText() );
                } else {
@@ -3357,12 +3477,12 @@ class Title {
                if( $this->mInterwiki != '' ) {
                        return true;  // any interwiki link might be viewable, for all we know
                }
-               switch( $this->mNamespace ) {                   
+               switch( $this->mNamespace ) {
                case NS_MEDIA:
                case NS_FILE:
                        return wfFindFile( $this );  // file exists, possibly in a foreign repo
                case NS_SPECIAL:
-                       return SpecialPage::exists( $this->getDBKey() );  // valid special page
+                       return SpecialPage::exists( $this->getDBkey() );  // valid special page
                case NS_MAIN:
                        return $this->mDbkeyform == '';  // selflink, possibly with fragment
                case NS_MEDIAWIKI:
@@ -3463,9 +3583,9 @@ class Title {
         * @return \type{\string} Trackback URL
         */
        public function trackbackURL() {
-               global $wgScriptPath, $wgServer;
+               global $wgScriptPath, $wgServer, $wgScriptExtension;
 
-               return "$wgServer$wgScriptPath/trackback.php?article="
+               return "$wgServer$wgScriptPath/trackback$wgScriptExtension?article="
                        . htmlspecialchars(urlencode($this->getPrefixedDBkey()));
        }
 
@@ -3500,40 +3620,29 @@ class Title {
         * Generate strings used for xml 'id' names in monobook tabs
         * @return \type{\string} XML 'id' name
         */
-       public function getNamespaceKey() {
+       public function getNamespaceKey( $prepend = 'nstab-' ) {
                global $wgContLang;
-               switch ($this->getNamespace()) {
-                       case NS_MAIN:
-                       case NS_TALK:
-                               return 'nstab-main';
-                       case NS_USER:
-                       case NS_USER_TALK:
-                               return 'nstab-user';
-                       case NS_MEDIA:
-                               return 'nstab-media';
-                       case NS_SPECIAL:
-                               return 'nstab-special';
-                       case NS_PROJECT:
-                       case NS_PROJECT_TALK:
-                               return 'nstab-project';
-                       case NS_FILE:
-                       case NS_FILE_TALK:
-                               return 'nstab-image';
-                       case NS_MEDIAWIKI:
-                       case NS_MEDIAWIKI_TALK:
-                               return 'nstab-mediawiki';
-                       case NS_TEMPLATE:
-                       case NS_TEMPLATE_TALK:
-                               return 'nstab-template';
-                       case NS_HELP:
-                       case NS_HELP_TALK:
-                               return 'nstab-help';
-                       case NS_CATEGORY:
-                       case NS_CATEGORY_TALK:
-                               return 'nstab-category';
-                       default:
-                               return 'nstab-' . $wgContLang->lc( $this->getSubjectNsText() );
+               // Gets the subject namespace if this title
+               $namespace = MWNamespace::getSubject( $this->getNamespace() );
+               // Checks if cononical namespace name exists for namespace
+               if ( MWNamespace::exists( $this->getNamespace() ) ) {
+                       // Uses canonical namespace name
+                       $namespaceKey = MWNamespace::getCanonicalName( $namespace );
+               } else {
+                       // Uses text of namespace
+                       $namespaceKey = $this->getSubjectNsText();
+               }
+               // Makes namespace key lowercase
+               $namespaceKey = $wgContLang->lc( $namespaceKey );
+               // Uses main
+               if ( $namespaceKey == '' ) {
+                       $namespaceKey = 'main';
                }
+               // Changes file to image for backwards compatibility
+               if ( $namespaceKey == 'file' ) {
+                       $namespaceKey = 'image';
+               }
+               return $prepend . $namespaceKey;
        }
 
        /**
@@ -3641,4 +3750,34 @@ class Title {
                }
                return $this->mBacklinkCache;
        }
+
+       /**
+        * Whether the magic words __INDEX__ and __NOINDEX__ function for
+        * this page.
+        * @return Bool
+        */
+       public function canUseNoindex(){
+               global $wgArticleRobotPolicies, $wgContentNamespaces,
+                      $wgExemptFromUserRobotsControl;
+
+               $bannedNamespaces = is_null( $wgExemptFromUserRobotsControl )
+                       ? $wgContentNamespaces
+                       : $wgExemptFromUserRobotsControl;
+
+               return !in_array( $this->mNamespace, $bannedNamespaces );
+
+       }
+       
+       public function getRestrictionTypes() {
+               global $wgRestrictionTypes;
+               $types = $this->exists() ? $wgRestrictionTypes : array('create');
+               
+               if ( $this->getNamespace() == NS_FILE ) {
+                       $types[] = 'upload';
+               }
+               
+               wfRunHooks( 'TitleGetRestrictionTypes', array( $this, &$types ) );
+                               
+               return $types;
+       }
 }