X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FTitle.php;h=616cc3d965a30c1d2c4d6c390b8d74fc5b760e1e;hb=17a9beebd642747072e9e60135d23f6a3cabeedd;hp=2a2e31862f922fc6a3000f9f87672df2f9f36869;hpb=71297a6934433ac5e6a2d32175ff747cb7e4170c;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/Title.php b/includes/Title.php index 2a2e31862f..616cc3d965 100644 --- a/includes/Title.php +++ b/includes/Title.php @@ -1,7 +1,7 @@ mLatestID = false; $this->mOldRestrictions = false; $this->mLength = -1; - $this->mRedirect = null; + $this->mRedirect = NULL; } /** @@ -192,12 +192,13 @@ class Title { * but not used for anything else * * @param int $id the page_id corresponding to the Title to create + * @param int $flags, use GAID_FOR_UPDATE to use master * @return Title the new object, or NULL on an error */ - public static function newFromID( $id ) { + public static function newFromID( $id, $flags = 0 ) { $fname = 'Title::newFromID'; - $dbr = wfGetDB( DB_SLAVE ); - $row = $dbr->selectRow( 'page', array( 'page_namespace', 'page_title' ), + $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 ); @@ -208,7 +209,7 @@ class Title { } /** - * Make an array of titles from an array of IDs + * Make an array of titles from an array of IDs */ public static function newFromIDs( $ids ) { if ( !count( $ids ) ) { @@ -224,18 +225,19 @@ class Title { } return $titles; } - + /** * Make a Title object from a DB row * @param Row $row (needs at least page_title,page_namespace) */ public static function newFromRow( $row ) { $t = self::makeTitle( $row->page_namespace, $row->page_title ); - $t->mArticleID = isset($row->page_id) ? $row->page_id : -1; - $t->mLength = isset($row->page_len) ? $row->page_len : -1; - $t->mRedirect = isset($row->page_is_redirect) ? (bool)$row->page_is_redirect : null; - $t->mLatest = isset($row->page_latest) ? $row->page_latest : 0; - + + $t->mArticleID = isset($row->page_id) ? intval($row->page_id) : -1; + $t->mLength = isset($row->page_len) ? intval($row->page_len) : -1; + $t->mRedirect = isset($row->page_is_redirect) ? (bool)$row->page_is_redirect : NULL; + $t->mLatestID = isset($row->page_latest) ? $row->page_latest : false; + return $t; } @@ -449,7 +451,7 @@ class Title { return $s->iw_url; } - + /** * Fetch interwiki prefix data from local cache in constant database * @@ -695,16 +697,15 @@ class Title { * @return string Base name */ public function getBaseText() { - global $wgNamespacesWithSubpages; - if( !empty( $wgNamespacesWithSubpages[$this->mNamespace] ) ) { - $parts = explode( '/', $this->getText() ); - # Don't discard the real title if there's no subpage involved - if( count( $parts ) > 1 ) - unset( $parts[ count( $parts ) - 1 ] ); - return implode( '/', $parts ); - } else { + if( !MWNamespace::hasSubpages( $this->mNamespace ) ) { return $this->getText(); } + + $parts = explode( '/', $this->getText() ); + # Don't discard the real title if there's no subpage involved + if( count( $parts ) > 1 ) + unset( $parts[ count( $parts ) - 1 ] ); + return implode( '/', $parts ); } /** @@ -712,13 +713,11 @@ class Title { * @return string Subpage name */ public function getSubpageText() { - global $wgNamespacesWithSubpages; - if( isset( $wgNamespacesWithSubpages[ $this->mNamespace ] ) && $wgNamespacesWithSubpages[ $this->mNamespace ] ) { - $parts = explode( '/', $this->mTextform ); - return( $parts[ count( $parts ) - 1 ] ); - } else { + if( !MWNamespace::hasSubpages( $this->mNamespace ) ) { return( $this->mTextform ); } + $parts = explode( '/', $this->mTextform ); + return( $parts[ count( $parts ) - 1 ] ); } /** @@ -853,7 +852,7 @@ class Title { $url = "{$wgScript}?title={$dbkey}&{$query}"; } } - + // FIXME: this causes breakage in various places when we // actually expected a local URL and end up with dupe prefixes. if ($wgRequest->getVal('action') == 'render') { @@ -967,7 +966,7 @@ class Title { return true; # Check regular protection levels - foreach( $wgRestrictionTypes as $type ){ + foreach( $wgRestrictionTypes as $type ){ if( $action == $type || $action == '' ) { $r = $this->getRestrictions( $type ); foreach( $wgRestrictionLevels as $level ) { @@ -1053,13 +1052,19 @@ class Title { * @return array Array of arrays of the arguments to wfMsg to explain permissions problems. */ public function getUserPermissionsErrors( $action, $user, $doExpensiveQueries = true ) { + if( !StubObject::isRealObject( $user ) ) { + //Since StubObject is always used on globals, we can unstub $wgUser here and set $user = $wgUser + global $wgUser; + $wgUser->_unstub( '', 5 ); + $user = $wgUser; + } $errors = $this->getUserPermissionsErrorsInternal( $action, $user, $doExpensiveQueries ); global $wgContLang; global $wgLang; global $wgEmailConfirmToEdit; - if ( $wgEmailConfirmToEdit && !$user->isEmailConfirmed() ) { + if ( $wgEmailConfirmToEdit && !$user->isEmailConfirmed() && $action != 'createaccount' ) { $errors[] = array( 'confirmedittext' ); } @@ -1108,7 +1113,8 @@ class Title { $intended = $user->mBlock->mAddress; - $errors[] = array ( ($block->mAuto ? 'autoblockedtext' : 'blockedtext'), $link, $reason, $ip, $name, $blockid, $blockExpiry, $intended, $blockTimestamp ); + $errors[] = array( ($block->mAuto ? 'autoblockedtext' : 'blockedtext'), $link, $reason, $ip, $name, + $blockid, $blockExpiry, $intended, $blockTimestamp ); } return $errors; @@ -1131,6 +1137,7 @@ class Title { // Use getUserPermissionsErrors instead if ( !wfRunHooks( 'userCan', array( &$this, &$user, $action, &$result ) ) ) { + wfProfileOut( __METHOD__ ); return $result ? array() : array( array( 'badaccess-group0' ) ); } @@ -1154,17 +1161,18 @@ class Title { else if ($result === false ) $errors[] = array('badaccess-group0'); # a generic "We don't want them to do that" } - - if( NS_SPECIAL == $this->mNamespace ) { + + $specialOKActions = array( 'createaccount', 'execute' ); + if( NS_SPECIAL == $this->mNamespace && !in_array( $action, $specialOKActions) ) { $errors[] = array('ns-specialprotected'); } - + if ( $this->isNamespaceProtected() ) { $ns = $this->getNamespace() == NS_MAIN ? wfMsg( 'nstab-main' ) : $this->getNsText(); - $errors[] = (NS_MEDIAWIKI == $this->mNamespace - ? array('protectedinterface') + $errors[] = (NS_MEDIAWIKI == $this->mNamespace + ? array('protectedinterface') : array( 'namespaceprotected', $ns ) ); } @@ -1181,7 +1189,7 @@ class Title { && !preg_match('/^'.preg_quote($user->getName(), '/').'\//', $this->mTextform) ) { $errors[] = array('customcssjsprotected'); } - + if ( $doExpensiveQueries && !$this->isCssJsSubpage() ) { # We /could/ use the protection level on the source page, but it's fairly ugly # as we have to establish a precedence hierarchy for pages included by multiple @@ -1204,22 +1212,17 @@ class Title { } } } - + foreach( $this->getRestrictions($action) as $right ) { // Backwards compatibility, rewrite sysop -> protect if ( $right == 'sysop' ) { $right = 'protect'; } if( '' != $right && !$user->isAllowed( $right ) ) { - //Users with 'editprotected' permission can edit protected pages - if( $action=='edit' && $user->isAllowed( 'editprotected' ) ) { - //Users with 'editprotected' permission cannot edit protected pages - //with cascading option turned on. - if($this->mCascadeRestriction) { - $errors[] = array( 'protectedpagetext', $right ); - } else { - //Nothing, user can edit! - } + // Users with 'editprotected' permission can edit protected + // pages if protection is not with cascading option turned on. + if( $action=='edit' && $user->isAllowed( 'editprotected' ) && !$this->areRestrictionsCascading() ) { + // Nothing, user can edit! } else { $errors[] = array( 'protectedpagetext', $right ); } @@ -1232,7 +1235,7 @@ class Title { } } - if ($action == 'create') { + if ($action == 'create') { $title_protection = $this->getTitleProtection(); if (is_array($title_protection)) { @@ -1297,7 +1300,7 @@ class Title { } $dbr = wfGetDB( DB_SLAVE ); - $res = $dbr->select( 'protected_titles', '*', + $res = $dbr->select( 'protected_titles', '*', array ('pt_namespace' => $this->getNamespace(), 'pt_title' => $this->getDBkey()) ); if ($row = $dbr->fetchRow( $res )) { @@ -1357,7 +1360,7 @@ class Title { public function deleteTitleProtection() { $dbw = wfGetDB( DB_MASTER ); - $dbw->delete( 'protected_titles', + $dbw->delete( 'protected_titles', array ('pt_namespace' => $this->getNamespace(), 'pt_title' => $this->getDBkey()), __METHOD__ ); } @@ -1422,7 +1425,7 @@ class Title { } else { global $wgWhitelistRead; - /** + /** * Always grant access to the login page. * Even anons need to be able to log in. */ @@ -1441,7 +1444,9 @@ class Title { * Check for explicit whitelisting */ $name = $this->getPrefixedText(); - if( in_array( $name, $wgWhitelistRead, true ) ) + $dbName = $this->getPrefixedDBKey(); + // Check with and without underscores + if( in_array($name,$wgWhitelistRead,true) || in_array($dbName,$wgWhitelistRead,true) ) return true; /** @@ -1481,62 +1486,43 @@ class Title { public function isTalkPage() { return MWNamespace::isTalk( $this->getNamespace() ); } - - /** - * Is this an article that is a redirect page? - * @return bool - */ - public function isRedirect() { - if( $this->mRedirect !== null ) - return $this->mRedirect; - # Zero for special pages - if( $this->mArticleID <= 0 ) - return 0; - $dbr = wfGetDB( DB_SLAVE ); - $redir = $dbr->selectField( 'page', 'page_is_redirect', - array( 'page_id' => $this->mArticleID ), - __METHOD__ ); - - $this->mRedirect = $redir ? true : false; - - return $this->mRedirect; - } - /** - * What is the length of this page (-1 for special pages)? + * Is this a subpage? * @return bool */ - public function getLength() { - if( $this->mLength != -1 || $this->mArticleID == 0 ) - return $this->mLength; - # Zero for special pages - if( $this->mArticleID <= 0 ) - return -1; - - $dbr = wfGetDB( DB_SLAVE ); - $len = $dbr->selectField( 'page', 'page_len', - array( 'page_id' => $this->mArticleID ), - __METHOD__ ); - $this->mLength = intval($len); - - return $this->mLength; + public function isSubpage() { + return MWNamespace::hasSubpages( $this->mNamespace ) + ? strpos( $this->getText(), '/' ) !== false + : false; } /** - * Is this a subpage? + * Does this have subpages? (Warning, usually requires an extra DB query.) * @return bool */ - public function isSubpage() { - global $wgNamespacesWithSubpages; - - if( isset( $wgNamespacesWithSubpages[ $this->mNamespace ] ) ) { - return ( strpos( $this->getText(), '/' ) !== false && $wgNamespacesWithSubpages[ $this->mNamespace ] == true ); - } else { + public function hasSubpages() { + if( !MWNamespace::hasSubpages( $this->mNamespace ) ) { + # Duh return false; } + + # We dynamically add a member variable for the purpose of this method + # alone to cache the result. There's no point in having it hanging + # around uninitialized in every Title object; therefore we only add it + # if needed and don't declare it statically. + if( isset( $this->mHasSubpages ) ) { + return $this->mHasSubpages; + } + + $db = wfGetDB( DB_SLAVE ); + return $this->mHasSubpages = (bool)$db->selectField( 'page', '1', + "page_namespace = {$this->mNamespace} AND page_title LIKE '" + . $db->escapeLike( $this->mDbkeyform ) . "/%'", + __METHOD__ + ); } - + /** * Could this page contain custom CSS or JavaScript, based * on the title? @@ -1620,16 +1606,13 @@ 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 $wgEnableCascadingProtection, $wgRestrictionTypes; + global $wgRestrictionTypes; # Define our dimension of restrictions types $pagerestrictions = array(); foreach( $wgRestrictionTypes as $action ) $pagerestrictions[$action] = array(); - if (!$wgEnableCascadingProtection) - return array( false, $pagerestrictions ); - if ( isset( $this->mCascadeSources ) && $get_pages ) { return array( $this->mCascadeSources, $this->mCascadingRestrictions ); } else if ( isset( $this->mHasCascadingRestrictions ) && !$get_pages ) { @@ -1638,7 +1621,7 @@ class Title { wfProfileIn( __METHOD__ ); - $dbr = wfGetDb( DB_SLAVE ); + $dbr = wfGetDB( DB_SLAVE ); if ( $this->getNamespace() == NS_IMAGE ) { $tables = array ('imagelinks', 'page_restrictions'); @@ -1668,7 +1651,7 @@ class Title { $sources = $get_pages ? array() : false; $now = wfTimestampNow(); $purgeExpired = false; - + while( $row = $dbr->fetchObject( $res ) ) { $expiry = Block::decodeExpiry( $row->pr_expiry ); if( $expiry > $now ) { @@ -1731,8 +1714,9 @@ class Title { # Backwards-compatibility: also load the restrictions from the page record (old format). - if ( $oldFashionedRestrictions == NULL ) { - $oldFashionedRestrictions = $dbr->selectField( 'page', 'page_restrictions', array( 'page_id' => $this->getArticleId() ), __METHOD__ ); + if ( $oldFashionedRestrictions === NULL ) { + $oldFashionedRestrictions = $dbr->selectField( 'page', 'page_restrictions', + array( 'page_id' => $this->getArticleId() ), __METHOD__ ); } if ($oldFashionedRestrictions != '') { @@ -1759,7 +1743,7 @@ class Title { while ($row = $dbr->fetchObject( $res ) ) { # Cycle through all the restrictions. - + // Don't take care of restrictions types that aren't in $wgRestrictionTypes if( !in_array( $row->pr_type, $wgRestrictionTypes ) ) continue; @@ -1876,7 +1860,7 @@ class Title { * @return int the ID */ public function getArticleID( $flags = 0 ) { - $linkCache =& LinkCache::singleton(); + $linkCache = LinkCache::singleton(); if ( $flags & GAID_FOR_UPDATE ) { $oldUpdate = $linkCache->forUpdate( true ); $this->mArticleID = $linkCache->addLinkObj( $this ); @@ -1889,14 +1873,59 @@ class Title { return $this->mArticleID; } - public function getLatestRevID() { + /** + * Is this an article that is a redirect page? + * Uses link cache, adding it if necessary + * @param int $flags a bit field; may be GAID_FOR_UPDATE to select for update + * @return bool + */ + public function isRedirect( $flags = 0 ) { + if( !is_null($this->mRedirect) ) + return $this->mRedirect; + # Zero for special pages. + # Also, calling getArticleID() loads the field from cache! + if( !$this->getArticleID($flags) || $this->getNamespace() == NS_SPECIAL ) { + return false; + } + $linkCache = LinkCache::singleton(); + $this->mRedirect = (bool)$linkCache->getGoodLinkFieldObj( $this, 'redirect' ); + + return $this->mRedirect; + } + + /** + * What is the length of this page? + * Uses link cache, adding it if necessary + * @param int $flags a bit field; may be GAID_FOR_UPDATE to select for update + * @return bool + */ + public function getLength( $flags = 0 ) { + if( $this->mLength != -1 ) + return $this->mLength; + # Zero for special pages. + # Also, calling getArticleID() loads the field from cache! + if( !$this->getArticleID($flags) || $this->getNamespace() == NS_SPECIAL ) { + return 0; + } + $linkCache = LinkCache::singleton(); + $this->mLength = intval( $linkCache->getGoodLinkFieldObj( $this, 'length' ) ); + + return $this->mLength; + } + + /** + * What is the page_latest field for this page? + * @param int $flags a bit field; may be GAID_FOR_UPDATE to select for update + * @return int + */ + public function getLatestRevID( $flags = 0 ) { if ($this->mLatestID !== false) return $this->mLatestID; - $db = wfGetDB(DB_SLAVE); + $db = ($flags & GAID_FOR_UPDATE) ? wfGetDB( DB_MASTER ) : wfGetDB( DB_SLAVE ); return $this->mLatestID = $db->selectField( 'revision', "max(rev_id)", - array('rev_page' => $this->getArticleID()), + array('rev_page' => $this->getArticleID($flags)), 'Title::getLatestRevID' ); } @@ -1911,7 +1940,7 @@ class Title { * @param int $newid the new Article ID */ public function resetArticleID( $newid ) { - $linkCache =& LinkCache::singleton(); + $linkCache = LinkCache::singleton(); $linkCache->clearBadLink( $this->getPrefixedDBkey() ); if ( 0 == $newid ) { $this->mArticleID = -1; } @@ -2000,7 +2029,7 @@ class Title { $this->mInterwiki = $this->mFragment = ''; $this->mNamespace = $this->mDefaultNamespace; # Usually NS_MAIN - + $dbkey = $this->mDbkeyform; # Strip Unicode bidi override characters. @@ -2008,7 +2037,7 @@ class Title { # override chars get included in list displays. $dbkey = str_replace( "\xE2\x80\x8E", '', $dbkey ); // 200E LEFT-TO-RIGHT MARK $dbkey = str_replace( "\xE2\x80\x8F", '', $dbkey ); // 200F RIGHT-TO-LEFT MARK - + # Clean up whitespace # $dbkey = preg_replace( '/[ _]+/', '_', $dbkey ); @@ -2115,7 +2144,7 @@ class Title { { return false; } - + /** * Magic tilde sequences? Nu-uh! */ @@ -2127,11 +2156,11 @@ class Title { * Limit the size of titles to 255 bytes. * This is typically the size of the underlying database field. * We make an exception for special pages, which don't need to be stored - * in the database, and may edge over 255 bytes due to subpage syntax + * in the database, and may edge over 255 bytes due to subpage syntax * for long titles, e.g. [[Special:Block/Long name]] */ if ( ( $this->mNamespace != NS_SPECIAL && strlen( $dbkey ) > 255 ) || - strlen( $dbkey ) > 512 ) + strlen( $dbkey ) > 512 ) { return false; } @@ -2160,18 +2189,18 @@ class Title { return false; } // Allow IPv6 usernames to start with '::' by canonicalizing IPv6 titles. - // IP names are not allowed for accounts, and can only be referring to - // edits from the IP. Given '::' abbreviations and caps/lowercaps, - // there are numerous ways to present the same IP. Having sp:contribs scan - // them all is silly and having some show the edits and others not is + // IP names are not allowed for accounts, and can only be referring to + // edits from the IP. Given '::' abbreviations and caps/lowercaps, + // there are numerous ways to present the same IP. Having sp:contribs scan + // them all is silly and having some show the edits and others not is // inconsistent. Same for talk/userpages. Keep them normalized instead. - $dbkey = ($this->mNamespace == NS_USER || $this->mNamespace == NS_USER_TALK) ? + $dbkey = ($this->mNamespace == NS_USER || $this->mNamespace == NS_USER_TALK) ? IP::sanitizeIP( $dbkey ) : $dbkey; // Any remaining initial :s are illegal. if ( $dbkey !== '' && ':' == $dbkey{0} ) { return false; } - + # Fill fields $this->mDbkeyform = $dbkey; $this->mUrlform = wfUrlencode( $dbkey ); @@ -2184,7 +2213,7 @@ class Title { /** * Set the fragment for this title * This is kind of bad, since except for this rarely-used function, Title objects - * are immutable. The reason this is here is because it's better than setting the + * are immutable. The reason this is here is because it's better than setting the * members directly, which is what Linker::formatComment was doing previously. * * @param string $fragment text @@ -2223,7 +2252,7 @@ class Title { * @return array the Title objects linking here */ public function getLinksTo( $options = '', $table = 'pagelinks', $prefix = 'pl' ) { - $linkCache =& LinkCache::singleton(); + $linkCache = LinkCache::singleton(); if ( $options ) { $db = wfGetDB( DB_MASTER ); @@ -2244,7 +2273,7 @@ class Title { if ( $db->numRows( $res ) ) { while ( $row = $db->fetchObject( $res ) ) { if ( $titleObj = Title::makeTitle( $row->page_namespace, $row->page_title ) ) { - $linkCache->addGoodLinkObj( $row->page_id, $titleObj, $row->page_len, $row->page_is_redir ); + $linkCache->addGoodLinkObj( $row->page_id, $titleObj, $row->page_len, $row->page_is_redirect ); $retVal[] = $titleObj; } } @@ -2356,50 +2385,64 @@ class Title { /** * 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.) + * Returns true if ok, or a getUserPermissionsErrors()-like array otherwise * @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 + * @return mixed True on success, getUserPermissionsErrors()-like array on failure */ public function isValidMoveOperation( &$nt, $auth = true ) { - if( !$this or !$nt ) { - return 'badtitletext'; + $errors = array(); + if( !$nt ) { + // Normally we'd add this to $errors, but we'll get + // lots of syntax errors if $nt is not an object + return array(array('badtitletext')); } if( $this->equals( $nt ) ) { - return 'selfmove'; + $errors[] = array('selfmove'); } if( !$this->isMovable() || !$nt->isMovable() ) { - return 'immobile_namespace'; + $errors[] = array('immobile_namespace'); } $oldid = $this->getArticleID(); $newid = $nt->getArticleID(); if ( strlen( $nt->getDBkey() ) < 1 ) { - return 'articleexists'; + $errors[] = array('articleexists'); } if ( ( '' == $this->getDBkey() ) || ( !$oldid ) || ( '' == $nt->getDBkey() ) ) { - return 'badarticleerror'; + $errors[] = array('badarticleerror'); + } + + // Image-specific checks + if( $this->getNamespace() == NS_IMAGE ) { + $file = wfLocalFile( $this ); + if( $file->exists() ) { + if( $nt->getNamespace() != NS_IMAGE ) { + $errors[] = array('imagenocrossnamespace'); + } + if( !File::checkExtensionCompatibility( $file, $nt->getDbKey() ) ) { + $errors[] = array('imagetypemismatch'); + } + } } if ( $auth ) { global $wgUser; - $errors = array_merge($this->getUserPermissionsErrors('move', $wgUser), + $errors = array_merge($errors, + $this->getUserPermissionsErrors('move', $wgUser), $this->getUserPermissionsErrors('edit', $wgUser), $nt->getUserPermissionsErrors('move', $wgUser), $nt->getUserPermissionsErrors('edit', $wgUser)); - if($errors !== array()) - return $errors[0][0]; } global $wgUser; $err = null; if( !wfRunHooks( 'AbortMove', array( $this, $nt, $wgUser, &$err ) ) ) { - return 'hookaborted'; + $errors[] = array('hookaborted', $err); } # The move is allowed only if (1) the target doesn't exist, or @@ -2408,15 +2451,18 @@ class Title { if ( 0 != $newid ) { # Target exists; check for validity if ( ! $this->isValidMoveTarget( $nt ) ) { - return 'articleexists'; + $errors[] = array('articleexists'); } } else { $tp = $nt->getTitleProtection(); - if ( $tp and !$wgUser->isAllowed( $tp['pt_create_perm'] ) ) { - return 'cantmove-titleprotected'; + $right = ( $tp['pt_create_perm'] == 'sysop' ) ? 'protect' : $tp['pt_create_perm']; + if ( $tp and !$wgUser->isAllowed( $right ) ) { + $errors[] = array('cantmove-titleprotected'); } } - return true; + if(empty($errors)) + return true; + return $errors; } /** @@ -2427,22 +2473,26 @@ class Title { * @param string $reason The reason for the move * @param bool $createRedirect Whether to create a redirect from the old title to the new title. * Ignored if the user doesn't have the suppressredirect right. - * @return mixed true on success, message name on failure + * @return mixed true on success, getUserPermissionsErrors()-like array on failure */ public function moveTo( &$nt, $auth = true, $reason = '', $createRedirect = true ) { $err = $this->isValidMoveOperation( $nt, $auth ); - if( is_string( $err ) ) { + if( is_array( $err ) ) { return $err; } $pageid = $this->getArticleID(); if( $nt->exists() ) { - $this->moveOverExistingRedirect( $nt, $reason, $createRedirect ); + $err = $this->moveOverExistingRedirect( $nt, $reason, $createRedirect ); $pageCountChange = ($createRedirect ? 0 : -1); } else { # Target didn't exist, do normal move. - $this->moveToNewTitle( $nt, $reason, $createRedirect ); + $err = $this->moveToNewTitle( $nt, $reason, $createRedirect ); $pageCountChange = ($createRedirect ? 1 : 0); } + + if( is_array( $err ) ) { + return $err; + } $redirid = $this->getArticleID(); // Category memberships include a sort key which may be customized. @@ -2509,7 +2559,7 @@ class Title { $newarticle = new Article( $nt ); $wgMessageCache->replace( $nt->getDBkey(), $newarticle->getContent() ); } - + global $wgUser; wfRunHooks( 'TitleMoveComplete', array( &$this, &$nt, &$wgUser, $pageid, $redirid ) ); return true; @@ -2537,7 +2587,9 @@ class Title { $now = wfTimestampNow(); $newid = $nt->getArticleID(); $oldid = $this->getArticleID(); + $dbw = wfGetDB( DB_MASTER ); + $dbw->begin(); # Delete the old redirect. We don't save it to history since # by definition if we've got here it's rather uninteresting. @@ -2561,6 +2613,9 @@ class Title { # Save a null revision in the page's history notifying of the move $nullRevision = Revision::newNullRevision( $dbw, $oldid, $comment, true ); $nullRevId = $nullRevision->insertOn( $dbw ); + + $article = new Article( $this ); + wfRunHooks( 'NewRevisionFromEditComplete', array($article, $nullRevision, false) ); # Change the name of the target page: $dbw->update( 'page', @@ -2576,8 +2631,7 @@ class Title { $nt->resetArticleID( $oldid ); # Recreate the redirect, this time in the other direction. - if($createRedirect || !$wgUser->isAllowed('suppressredirect')) - { + if( $createRedirect || !$wgUser->isAllowed('suppressredirect') ) { $mwRedir = MagicWord::get( 'redirect' ); $redirectText = $mwRedir->getSynonym( 0 ) . ' [[' . $nt->getPrefixedText() . "]]\n"; $redirectArticle = new Article( $this ); @@ -2588,6 +2642,8 @@ class Title { 'text' => $redirectText ) ); $redirectRevision->insertOn( $dbw ); $redirectArticle->updateRevisionOn( $dbw, $redirectRevision, 0 ); + + wfRunHooks( 'NewRevisionFromEditComplete', array($redirectArticle, $redirectRevision, false) ); # Now, we record the link from the redirect to the new title. # It should have no other outgoing links... @@ -2602,6 +2658,19 @@ class Title { $this->resetArticleID( 0 ); } + # Move an image if this is a file + if( $this->getNamespace() == NS_IMAGE ) { + $file = wfLocalFile( $this ); + if( $file->exists() ) { + $status = $file->move( $nt ); + if( !$status->isOk() ) { + $dbw->rollback(); + return $status->getErrorsArray(); + } + } + } + $dbw->commit(); + # Log the move $log = new LogPage( 'move' ); $log->addEntry( 'move_redir', $this, $reason, array( 1 => $nt->getPrefixedText() ) ); @@ -2612,6 +2681,7 @@ class Title { $u = new SquidUpdate( $urls ); $u->doUpdate(); } + } /** @@ -2631,12 +2701,17 @@ class Title { $newid = $nt->getArticleID(); $oldid = $this->getArticleID(); + $dbw = wfGetDB( DB_MASTER ); + $dbw->begin(); $now = $dbw->timestamp(); # Save a null revision in the page's history notifying of the move $nullRevision = Revision::newNullRevision( $dbw, $oldid, $comment, true ); $nullRevId = $nullRevision->insertOn( $dbw ); + + $article = new Article( $this ); + wfRunHooks( 'NewRevisionFromEditComplete', array($article, $nullRevision, false) ); # Rename page entry $dbw->update( 'page', @@ -2651,8 +2726,7 @@ class Title { ); $nt->resetArticleID( $oldid ); - if($createRedirect || !$wgUser->isAllowed('suppressredirect')) - { + if( $createRedirect || !$wgUser->isAllowed('suppressredirect') ) { # Insert redirect $mwRedir = MagicWord::get( 'redirect' ); $redirectText = $mwRedir->getSynonym( 0 ) . ' [[' . $nt->getPrefixedText() . "]]\n"; @@ -2664,6 +2738,8 @@ class Title { 'text' => $redirectText ) ); $redirectRevision->insertOn( $dbw ); $redirectArticle->updateRevisionOn( $dbw, $redirectRevision, 0 ); + + wfRunHooks( 'NewRevisionFromEditComplete', array($redirectArticle, $redirectRevision, false) ); # Record the just-created redirect's linking to the page $dbw->insert( 'pagelinks', @@ -2675,6 +2751,19 @@ class Title { } else { $this->resetArticleID( 0 ); } + + # Move an image if this is a file + if( $this->getNamespace() == NS_IMAGE ) { + $file = wfLocalFile( $this ); + if( $file->exists() ) { + $status = $file->move( $nt ); + if( !$status->isOk() ) { + $dbw->rollback(); + return $status->getErrorsArray(); + } + } + } + $dbw->commit(); # Log the move $log = new LogPage( 'move' ); @@ -2686,6 +2775,7 @@ class Title { # Purge old title from squid # The new title, and links to the new title, are purged in Article::onArticleCreate() $this->purgeSquid(); + } /** @@ -2699,6 +2789,15 @@ class Title { $fname = 'Title::isValidMoveTarget'; $dbw = wfGetDB( DB_MASTER ); + # Is it an existsing file? + if( $nt->getNamespace() == NS_IMAGE ) { + $file = wfLocalFile( $nt ); + if( $file->exists() ) { + wfDebug( __METHOD__ . ": file exists\n" ); + return false; + } + } + # Is it a redirect? $id = $nt->getArticleID(); $obj = $dbw->selectRow( array( 'page', 'revision', 'text'), @@ -2742,7 +2841,7 @@ class Title { # Return true if there was no history return $row === false; } - + /** * Can this title be added to a user's watchlist? * @@ -2795,7 +2894,7 @@ class Title { $stack = array(); $parents = $this->getParentCategories(); - if($parents != '') { + if( $parents ) { foreach($parents as $parent => $current) { if ( array_key_exists( $parent, $children ) ) { # Circular reference @@ -2828,30 +2927,43 @@ class Title { * Get the revision ID of the previous revision * * @param integer $revision Revision ID. Get the revision that was before this one. + * @param integer $flags, GAID_FOR_UPDATE * @return integer $oldrevision|false */ - public function getPreviousRevisionID( $revision ) { - $dbr = wfGetDB( DB_SLAVE ); - return $dbr->selectField( 'revision', 'rev_id', - 'rev_page=' . intval( $this->getArticleId() ) . - ' AND rev_id<' . intval( $revision ) . ' ORDER BY rev_id DESC' ); + public function getPreviousRevisionID( $revision, $flags=0 ) { + $db = ($flags & GAID_FOR_UPDATE) ? wfGetDB( DB_MASTER ) : wfGetDB( DB_SLAVE ); + return $db->selectField( 'revision', 'rev_id', + array( + 'rev_page' => $this->getArticleId($flags), + 'rev_id < ' . intval( $revision ) + ), + __METHOD__, + array( 'ORDER BY' => 'rev_id DESC' ) + ); } /** * Get the revision ID of the next revision * * @param integer $revision Revision ID. Get the revision that was after this one. + * @param integer $flags, GAID_FOR_UPDATE * @return integer $oldrevision|false */ - public function getNextRevisionID( $revision ) { - $dbr = wfGetDB( DB_SLAVE ); - return $dbr->selectField( 'revision', 'rev_id', - 'rev_page=' . intval( $this->getArticleId() ) . - ' AND rev_id>' . intval( $revision ) . ' ORDER BY rev_id' ); + public function getNextRevisionID( $revision, $flags=0 ) { + $db = ($flags & GAID_FOR_UPDATE) ? wfGetDB( DB_MASTER ) : wfGetDB( DB_SLAVE ); + return $db->selectField( 'revision', 'rev_id', + array( + 'rev_page' => $this->getArticleId($flags), + 'rev_id > ' . intval( $revision ) + ), + __METHOD__, + array( 'ORDER BY' => 'rev_id' ) + ); } /** * Get the number of revisions between the given revision IDs. + * Used for diffs and other things that really need it. * * @param integer $old Revision ID. * @param integer $new Revision ID. @@ -2862,7 +2974,9 @@ class Title { return $dbr->selectField( 'revision', 'count(*)', 'rev_page = ' . intval( $this->getArticleId() ) . ' AND rev_id > ' . intval( $old ) . - ' AND rev_id < ' . intval( $new ) ); + ' AND rev_id < ' . intval( $new ), + __METHOD__, + array( 'USE INDEX' => 'PRIMARY' ) ); } /** @@ -2877,7 +2991,18 @@ class Title { && $this->getNamespace() == $title->getNamespace() && $this->getDBkey() === $title->getDBkey(); } - + + /** + * Callback for usort() to do title sorts by (namespace, title) + */ + static function compare( $a, $b ) { + if( $a->getNamespace() == $b->getNamespace() ) { + return strcmp( $a->getText(), $b->getText() ); + } else { + return $a->getNamespace() - $b->getNamespace(); + } + } + /** * Return a string representation of this title * @@ -2915,7 +3040,7 @@ class Title { /** * Update page_touched timestamps and send squid purge messages for - * pages linking to this title. May be sent to the job queue depending + * pages linking to this title. May be sent to the job queue depending * on the number of links. Typically called on create and delete. */ public function touchLinks() { @@ -2934,7 +3059,7 @@ class Title { public function getTouched() { $dbr = wfGetDB( DB_SLAVE ); $touched = $dbr->selectField( 'page', 'page_touched', - array( + array( 'page_namespace' => $this->getNamespace(), 'page_title' => $this->getDBkey() ), __METHOD__ @@ -3027,7 +3152,7 @@ class Title { } /** - * If the Title refers to a special page alias which is not the local default, + * If the Title refers to a special page alias which is not the local default, * returns a new Title which points to the local default. Otherwise, returns $this. */ public function fixSpecialName() { @@ -3053,5 +3178,29 @@ class Title { public function isContentPage() { return MWNamespace::isContent( $this->getNamespace() ); } - + + public function getRedirectsHere( $ns = null ) { + $redirs = array(); + + $dbr = wfGetDB( DB_SLAVE ); + $where = array( + 'rd_namespace' => $this->getNamespace(), + 'rd_title' => $this->getDBkey(), + 'rd_from = page_id' + ); + if ( !is_null($ns) ) $where['page_namespace'] = $ns; + + $result = $dbr->select( + array( 'redirect', 'page' ), + array( 'page_namespace', 'page_title' ), + $where, + __METHOD__ + ); + + + while( $row = $dbr->fetchObject( $result ) ) { + $redirs[] = self::newFromRow( $row ); + } + return $redirs; + } }