X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FTitle.php;h=274bd2556be23fd12f885b3be3bfd175cbc949ba;hb=ad39f2da8660219768f46db739be66a27c8eb651;hp=393427245213d39b977b1c6c8c72e41d693a79c2;hpb=2e7a059abbb2b174a2c381744d23ed1c1fe3184c;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/Title.php b/includes/Title.php index 3934272452..274bd2556b 100644 --- a/includes/Title.php +++ b/includes/Title.php @@ -1,24 +1,25 @@ select( 'page', array( @@ -254,15 +252,35 @@ class Title { */ public static function newFromRow( $row ) { $t = self::makeTitle( $row->page_namespace, $row->page_title ); - - $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 ) ? intval( $row->page_latest ) : false; - + $t->loadFromRow( $row ); return $t; } + /** + * Load Title object fields from a DB row. + * If false is given, the title will be treated as non-existing. + * + * @param $row Object|false database row + * @return void + */ + public function loadFromRow( $row ) { + if ( $row ) { // page found + if ( isset( $row->page_id ) ) + $this->mArticleID = (int)$row->page_id; + if ( isset( $row->page_len ) ) + $this->mLength = (int)$row->page_len; + if ( isset( $row->page_is_redirect ) ) + $this->mRedirect = (bool)$row->page_is_redirect; + if ( isset( $row->page_latest ) ) + $this->mLatestID = (int)$row->page_latest; + } else { // page not found + $this->mArticleID = 0; + $this->mLength = 0; + $this->mRedirect = false; + $this->mLatestID = 0; + } + } + /** * Create a new Title from a namespace index and a DB key. * It's assumed that $ns and $title are *valid*, for instance when @@ -272,8 +290,8 @@ class Title { * * @param $ns Int the namespace of the article * @param $title String the unprefixed database key form - * @param $fragment String The link fragment (after the "#") - * @param $interwiki String The interwiki prefix + * @param $fragment String the link fragment (after the "#") + * @param $interwiki String the interwiki prefix * @return Title the new object */ public static function &makeTitle( $ns, $title, $fragment = '', $interwiki = '' ) { @@ -294,9 +312,9 @@ class Title { * than makeTitle() but safer for user-provided data. * * @param $ns Int the namespace of the article - * @param $title String the database key form - * @param $fragment String The link fragment (after the "#") - * @param $interwiki String The interwiki prefix + * @param $title String database key form + * @param $fragment String the link fragment (after the "#") + * @param $interwiki String interwiki prefix * @return Title the new object, or NULL on an error */ public static function makeTitleSafe( $ns, $title, $fragment = '', $interwiki = '' ) { @@ -343,7 +361,7 @@ class Title { * in order to provide (hopefully) the Title of the final destination instead of another redirect * * @param $text String Text with possible redirect - * @return Title The corresponding Title + * @return Title */ public static function newFromRedirectRecurse( $text ) { $titles = self::newFromRedirectArray( $text ); @@ -361,10 +379,6 @@ class Title { */ public static function newFromRedirectArray( $text ) { global $wgMaxRedirects; - // are redirects disabled? - if ( $wgMaxRedirects < 1 ) { - return null; - } $title = self::newFromRedirectInternal( $text ); if ( is_null( $title ) ) { return null; @@ -396,9 +410,14 @@ class Title { * Do not call this function directly, use one of the newFromRedirect* functions above * * @param $text String Text with possible redirect - * @return Title The corresponding Title + * @return Title */ protected static function newFromRedirectInternal( $text ) { + global $wgMaxRedirects; + if ( $wgMaxRedirects < 1 ) { + //redirects are disabled, so quit early + return null; + } $redir = MagicWord::get( 'redirect' ); $text = trim( $text ); if ( $redir->matchStartAndRemove( $text ) ) { @@ -432,8 +451,7 @@ class Title { * Get the prefixed DB key associated with an ID * * @param $id Int the page_id of the article - * @return Title an object representing the article, or NULL - * if no such article was found + * @return Title an object representing the article, or NULL if no such article was found */ public static function nameOf( $id ) { $dbr = wfGetDB( DB_SLAVE ); @@ -468,8 +486,7 @@ class Title { * * @param $ns Int a namespace index * @param $title String text-form main part - * @return String a stripped-down title string ready for the - * search index + * @return String a stripped-down title string ready for the search index */ public static function indexTitle( $ns, $title ) { global $wgContLang; @@ -518,8 +535,7 @@ class Title { * Determine whether the object refers to a page within * this project. * - * @return Bool TRUE if this is an in-project interwiki link - * or a wikilink, FALSE otherwise + * @return Bool TRUE if this is an in-project interwiki link or a wikilink, FALSE otherwise */ public function isLocal() { if ( $this->mInterwiki != '' ) { @@ -544,8 +560,7 @@ class Title { } /** - * Returns the DB name of the distant wiki - * which owns the object. + * Returns the DB name of the distant wiki which owns the object. * * @return String the DB name */ @@ -598,7 +613,7 @@ class Title { public function getDBkey() { return $this->mDbkeyform; } /** - * Get the namespace index, i.e.\ one of the NS_xxxx constants. + * Get the namespace index, i.e. one of the NS_xxxx constants. * * @return Integer: Namespace index */ @@ -623,6 +638,13 @@ class Title { return MWNamespace::getCanonicalName( $this->mNamespace ); } } + + if ( $wgContLang->needsGenderDistinction() && + MWNamespace::hasGenderDistinction( $this->mNamespace ) ) { + $gender = GenderCache::singleton()->getGenderOf( $this->getText(), __METHOD__ ); + return $wgContLang->getGenderNsText( $this->mNamespace, $gender ); + } + return $wgContLang->getNsText( $this->mNamespace ); } @@ -726,7 +748,8 @@ class Title { * @return String the prefixed title, with spaces */ public function getPrefixedText() { - if ( empty( $this->mPrefixedText ) ) { // FIXME: bad usage of empty() ? + // @todo FIXME: Bad usage of empty() ? + if ( empty( $this->mPrefixedText ) ) { $s = $this->prefix( $this->mTextform ); $s = str_replace( '_', ' ', $s ); $this->mPrefixedText = $s; @@ -734,12 +757,25 @@ class Title { return $this->mPrefixedText; } + /** + * Return the prefixed title with spaces _without_ the interwiki prefix + * + * @return \type{\string} the title, prefixed by the namespace but not by the interwiki prefix, with spaces + */ + public function getSemiPrefixedText() { + if ( !isset( $this->mSemiPrefixedText ) ){ + $s = ( $this->mNamespace === NS_MAIN ? '' : $this->getNsText() . ':' ) . $this->mTextform; + $s = str_replace( '_', ' ', $s ); + $this->mSemiPrefixedText = $s; + } + return $this->mSemiPrefixedText; + } + /** * Get the prefixed title with spaces, plus any fragment * (part beginning with '#') * - * @return String the prefixed title, with spaces and - * the fragment, including '#' + * @return String the prefixed title, with spaces and the fragment, including '#' */ public function getFullText() { $text = $this->getPrefixedText(); @@ -750,7 +786,7 @@ class Title { } /** - * Get the base name, i.e. the leftmost parts before the / + * Get the base page name, i.e. the leftmost part before any slashes * * @return String Base name */ @@ -768,7 +804,7 @@ class Title { } /** - * Get the lowest-level subpage name, i.e. the rightmost part after / + * Get the lowest-level subpage name, i.e. the rightmost part after any slashes * * @return String Subpage name */ @@ -813,33 +849,13 @@ class Title { * @return String the URL */ public function getFullURL( $query = '', $variant = false ) { - global $wgServer, $wgRequest; - - if ( is_array( $query ) ) { - $query = wfArrayToCGI( $query ); - } - - $interwiki = Interwiki::fetch( $this->mInterwiki ); - if ( !$interwiki ) { - $url = $this->getLocalURL( $query, $variant ); + # Hand off all the decisions on urls to getLocalURL + $url = $this->getLocalURL( $query, $variant ); - // Ugly quick hack to avoid duplicate prefixes (bug 4571 etc) - // Correct fix would be to move the prepending elsewhere. - if ( $wgRequest->getVal( 'action' ) != 'render' ) { - $url = $wgServer . $url; - } - } else { - $baseUrl = $interwiki->getURL(); - - $namespace = wfUrlencode( $this->getNsText() ); - if ( $namespace != '' ) { - # Can this actually happen? Interwikis shouldn't be parsed. - # Yes! It can in interwiki transclusion. But... it probably shouldn't. - $namespace .= ':'; - } - $url = str_replace( '$1', $namespace . $this->mUrlform, $baseUrl ); - $url = wfAppendQuery( $url, $query ); - } + # Expand the url to make it a full url. Note that getLocalURL has the + # potential to output full urls for a variety of reasons, so we use + # wfExpandUrl instead of simply prepending $wgServer + $url = wfExpandUrl( $url, PROTO_RELATIVE ); # Finally, add the fragment. $url .= $this->getFragmentForURL(); @@ -867,15 +883,16 @@ class Title { $query = wfArrayToCGI( $query ); } - if ( $this->isExternal() ) { - $url = $this->getFullURL(); - if ( $query ) { - // This is currently only used for edit section links in the - // context of interwiki transclusion. In theory we should - // append the query to the end of any existing query string, - // but interwiki transclusion is already broken in that case. - $url .= "?$query"; + $interwiki = Interwiki::fetch( $this->mInterwiki ); + if ( $interwiki ) { + $namespace = $this->getNsText(); + if ( $namespace != '' ) { + # Can this actually happen? Interwikis shouldn't be parsed. + # Yes! It can in interwiki transclusion. But... it probably shouldn't. + $namespace .= ':'; } + $url = $interwiki->getURL( $namespace . $this->getDBkey() ); + $url = wfAppendQuery( $url, $query ); } else { $dbkey = wfUrlencode( $this->getPrefixedDBkey() ); if ( $query == '' ) { @@ -889,6 +906,7 @@ class Title { $url = str_replace( '$1', $dbkey, $url ); } else { $url = str_replace( '$1', $dbkey, $wgArticlePath ); + wfRunHooks( 'GetLocalURL::Article', array( &$this, &$url ) ); } } else { global $wgActionPaths; @@ -909,6 +927,7 @@ class Title { } } } + if ( $url === false ) { if ( $query == '-' ) { $query = ''; @@ -917,13 +936,15 @@ class Title { } } - // FIXME: this causes breakage in various places when we + wfRunHooks( 'GetLocalURL::Internal', array( &$this, &$url, $query, $variant ) ); + + // @todo 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' ) { $url = $wgServer . $url; } } - wfRunHooks( 'GetLocalURL', array( &$this, &$url, $query ) ); + wfRunHooks( 'GetLocalURL', array( &$this, &$url, $query, $variant ) ); return $url; } @@ -939,7 +960,7 @@ class Title { * * @param $query Array of Strings An associative array of key => value pairs for the * query string. Keys and values will be escaped. - * @param $variant String Language variant of URL (for sr, zh..). Ignored + * @param $variant String language variant of URL (for sr, zh..). Ignored * for external links. Default is "false" (same variant as current page, * for anonymous users). * @return String the URL @@ -978,23 +999,57 @@ class Title { public function escapeFullURL( $query = '' ) { return htmlspecialchars( $this->getFullURL( $query ) ); } + + /** + * HTML-escaped version of getCanonicalURL() + */ + public function escapeCanonicalURL( $query = '', $variant = false ) { + return htmlspecialchars( $this->getCanonicalURL( $query, $variant ) ); + } /** * Get the URL form for an internal link. * - Used in various Squid-related code, in case we have a different * internal hostname for the server from the exposed one. + * + * This uses $wgInternalServer to qualify the path, or $wgServer + * if $wgInternalServer is not set. If the server variable used is + * protocol-relative, the URL will be expanded to http:// * * @param $query String an optional query string * @param $variant String language variant of url (for sr, zh..) * @return String the URL */ public function getInternalURL( $query = '', $variant = false ) { - global $wgInternalServer; - $url = $wgInternalServer . $this->getLocalURL( $query, $variant ); + if ( $this->isExternal( ) ) { + $server = ''; + } else { + global $wgInternalServer, $wgServer; + $server = $wgInternalServer !== false ? $wgInternalServer : $wgServer; + } + $url = wfExpandUrl( $server . $this->getLocalURL( $query, $variant ), PROTO_HTTP ); wfRunHooks( 'GetInternalURL', array( &$this, &$url, $query ) ); return $url; } + /** + * Get the URL for a canonical link, for use in things like IRC and + * e-mail notifications. Uses $wgCanonicalServer and the + * GetCanonicalURL hook. + * + * NOTE: Unlike getInternalURL(), the canonical URL includes the fragment + * + * @param $query string An optional query string + * @param $variant string Language variant of URL (for sr, zh, ...) + * @return string The URL + */ + public function getCanonicalURL( $query = '', $variant = false ) { + global $wgCanonicalServer; + $url = wfExpandUrl( $this->getLocalURL( $query, $variant ) . $this->getFragmentForURL(), PROTO_CANONICAL ); + wfRunHooks( '', array( &$this, &$url, $query ) ); + return $url; + } + /** * Get the edit URL for this Title * @@ -1143,17 +1198,12 @@ class Title { * Determines if $user is unable to edit this page because it has been protected * by $wgNamespaceProtection. * - * @param $user User object, $wgUser will be used if not passed + * @param $user User object to check permissions * @return Bool */ - public function isNamespaceProtected( User $user = null ) { + public function isNamespaceProtected( User $user ) { global $wgNamespaceProtection; - if ( $user === null ) { - global $wgUser; - $user = $wgUser; - } - if ( isset( $wgNamespaceProtection[$this->mNamespace] ) ) { foreach ( (array)$wgNamespaceProtection[$this->mNamespace] as $right ) { if ( $right != '' && !$user->isAllowed( $right ) ) { @@ -1179,13 +1229,14 @@ class Title { /** * Can $user perform $action on this page? * - * FIXME: This *does not* check throttles (User::pingLimiter()). + * @todo FIXME: This *does not* check throttles (User::pingLimiter()). * * @param $action String action that permission needs to be checked for * @param $user User to check - * @param $doExpensiveQueries Bool Set this to false to avoid doing unnecessary queries. + * @param $doExpensiveQueries Bool Set this to false to avoid doing unnecessary queries by + * skipping checks for cascading protections and user blocks. * @param $ignoreErrors Array of Strings Set this to a list of message keys whose corresponding errors may be ignored. - * @return Array of arrays of the arguments to wfMsg to explain permissions problems. + * @return Array of arguments to wfMsg to explain permissions problems. */ public function getUserPermissionsErrors( $action, $user, $doExpensiveQueries = true, $ignoreErrors = array() ) { $errors = $this->getUserPermissionsErrorsInternal( $action, $user, $doExpensiveQueries ); @@ -1214,34 +1265,33 @@ class Title { * @return Array list of errors */ private function checkQuickPermissions( $action, $user, $errors, $doExpensiveQueries, $short ) { + $ns = $this->getNamespace(); + if ( $action == 'create' ) { - if ( ( $this->isTalkPage() && !$user->isAllowed( 'createtalk' ) ) || - ( !$this->isTalkPage() && !$user->isAllowed( 'createpage' ) ) ) { + if ( ( $this->isTalkPage() && !$user->isAllowed( 'createtalk', $ns ) ) || + ( !$this->isTalkPage() && !$user->isAllowed( 'createpage', $ns ) ) ) { $errors[] = $user->isAnon() ? array( 'nocreatetext' ) : array( 'nocreate-loggedin' ); } } elseif ( $action == 'move' ) { - if ( !$user->isAllowed( 'move-rootuserpages' ) - && $this->mNamespace == NS_USER && !$this->isSubpage() ) { + if ( !$user->isAllowed( 'move-rootuserpages', $ns ) + && $ns == NS_USER && !$this->isSubpage() ) { // Show user page-specific message only if the user can move other pages $errors[] = array( 'cant-move-user-page' ); } // Check if user is allowed to move files if it's a file - if ( $this->mNamespace == NS_FILE && !$user->isAllowed( 'movefile' ) ) { + if ( $ns == NS_FILE && !$user->isAllowed( 'movefile', $ns ) ) { $errors[] = array( 'movenotallowedfile' ); } - if ( !$user->isAllowed( 'move' ) ) { + if ( !$user->isAllowed( 'move', $ns) ) { // User can't move anything - global $wgGroupPermissions; - $userCanMove = false; - if ( isset( $wgGroupPermissions['user']['move'] ) ) { - $userCanMove = $wgGroupPermissions['user']['move']; - } - $autoconfirmedCanMove = false; - if ( isset( $wgGroupPermissions['autoconfirmed']['move'] ) ) { - $autoconfirmedCanMove = $wgGroupPermissions['autoconfirmed']['move']; - } + + $userCanMove = in_array( 'move', User::getGroupPermissions( + array( 'user' ), $ns ), true ); + $autoconfirmedCanMove = in_array( 'move', User::getGroupPermissions( + array( 'autoconfirmed' ), $ns ), true ); + if ( $user->isAnon() && ( $userCanMove || $autoconfirmedCanMove ) ) { // custom message if logged-in users without any special rights can move $errors[] = array( 'movenologintext' ); @@ -1250,20 +1300,20 @@ class Title { } } } elseif ( $action == 'move-target' ) { - if ( !$user->isAllowed( 'move' ) ) { + if ( !$user->isAllowed( 'move', $ns ) ) { // User can't move anything $errors[] = array( 'movenotallowed' ); - } elseif ( !$user->isAllowed( 'move-rootuserpages' ) - && $this->mNamespace == NS_USER && !$this->isSubpage() ) { + } elseif ( !$user->isAllowed( 'move-rootuserpages', $ns ) + && $ns == NS_USER && !$this->isSubpage() ) { // Show user page-specific message only if the user can move other pages $errors[] = array( 'cant-move-to-user-page' ); } - } elseif ( !$user->isAllowed( $action ) ) { + } elseif ( !$user->isAllowed( $action, $ns ) ) { // We avoid expensive display logic for quickUserCan's and such $groups = false; if ( !$short ) { $groups = array_map( array( 'User', 'makeGroupLinkWiki' ), - User::getGroupsWithPermission( $action ) ); + User::getGroupsWithPermission( $action, $ns ) ); } if ( $groups ) { @@ -1294,13 +1344,13 @@ class Title { if ( is_array( $result ) && count( $result ) && !is_array( $result[0] ) ) { // A single array representing an error $errors[] = $result; - } else if ( is_array( $result ) && is_array( $result[0] ) ) { + } elseif ( is_array( $result ) && is_array( $result[0] ) ) { // A nested array representing multiple errors $errors = array_merge( $errors, $result ); - } else if ( $result !== '' && is_string( $result ) ) { + } elseif ( $result !== '' && is_string( $result ) ) { // A string representing a message-id $errors[] = array( $result ); - } else if ( $result === false ) { + } elseif ( $result === false ) { // a generic "We don't want them to do that" $errors[] = array( 'badaccess-group0' ); } @@ -1381,15 +1431,13 @@ class Title { private function checkCSSandJSPermissions( $action, $user, $errors, $doExpensiveQueries, $short ) { # 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->userCanEditCssSubpage() - # and $this->userCanEditJsSubpage() from working # XXX: right 'editusercssjs' is deprecated, for backward compatibility only if ( $action != 'patrol' && !$user->isAllowed( 'editusercssjs' ) && !preg_match( '/^' . preg_quote( $user->getName(), '/' ) . '\//', $this->mTextform ) ) { if ( $this->isCssSubpage() && !$user->isAllowed( 'editusercss' ) ) { - $errors[] = array( 'customcssjsprotected' ); - } else if ( $this->isJsSubpage() && !$user->isAllowed( 'edituserjs' ) ) { - $errors[] = array( 'customcssjsprotected' ); + $errors[] = array( 'customcssprotected' ); + } elseif ( $this->isJsSubpage() && !$user->isAllowed( 'edituserjs' ) ) { + $errors[] = array( 'customjsprotected' ); } } @@ -1415,9 +1463,9 @@ class Title { if ( $right == 'sysop' ) { $right = 'protect'; } - if ( $right != '' && !$user->isAllowed( $right ) ) { + if ( $right != '' && !$user->isAllowed( $right, $this->mNamespace ) ) { // Users with 'editprotected' permission can edit protected pages - if ( $action == 'edit' && $user->isAllowed( 'editprotected' ) ) { + if ( $action == 'edit' && $user->isAllowed( 'editprotected', $this->mNamespace ) ) { // Users with 'editprotected' permission cannot edit protected pages // with cascading option turned on. if ( $this->mCascadeRestriction ) { @@ -1434,9 +1482,9 @@ class Title { /** * Check restrictions on cascading pages. - * + * * @param $action String the action to check - * @param $user User user to check + * @param $user User to check * @param $errors Array list of current errors * @param $doExpensiveQueries Boolean whether or not to perform expensive queries * @param $short Boolean short circuit on first error @@ -1458,7 +1506,7 @@ class Title { if ( isset( $restrictions[$action] ) ) { foreach ( $restrictions[$action] as $right ) { $right = ( $right == 'sysop' ) ? 'protect' : $right; - if ( $right != '' && !$user->isAllowed( $right ) ) { + if ( $right != '' && !$user->isAllowed( $right, $this->mNamespace ) ) { $pages = ''; foreach ( $cascadingSources as $page ) $pages .= '* [[:' . $page->getPrefixedText() . "]]\n"; @@ -1475,7 +1523,7 @@ class Title { * Check action permissions not already checked in checkQuickPermissions * * @param $action String the action to check - * @param $user User user to check + * @param $user User to check * @param $errors Array list of current errors * @param $doExpensiveQueries Boolean whether or not to perform expensive queries * @param $short Boolean short circuit on first error @@ -1494,7 +1542,9 @@ class Title { if( $title_protection['pt_create_perm'] == 'sysop' ) { $title_protection['pt_create_perm'] = 'protect'; // B/C } - if( $title_protection['pt_create_perm'] == '' || !$user->isAllowed( $title_protection['pt_create_perm'] ) ) { + if( $title_protection['pt_create_perm'] == '' || + !$user->isAllowed( $title_protection['pt_create_perm'], + $this->mNamespace ) ) { $errors[] = array( 'titleprotected', User::whoIs( $title_protection['pt_user'] ), $title_protection['pt_reason'] ); } } @@ -1505,7 +1555,7 @@ class Title { $errors[] = array( 'immobile-source-namespace', $this->getNsText() ); } elseif ( !$this->isMovable() ) { // Less specific message for rarer cases - $errors[] = array( 'immobile-page' ); + $errors[] = array( 'immobile-source-page' ); } } elseif ( $action == 'move-target' ) { if ( !MWNamespace::isMovable( $this->mNamespace ) ) { @@ -1521,7 +1571,7 @@ class Title { * Check that the user isn't blocked from editting. * * @param $action String the action to check - * @param $user User user to check + * @param $user User to check * @param $errors Array list of current errors * @param $doExpensiveQueries Boolean whether or not to perform expensive queries * @param $short Boolean short circuit on first error @@ -1529,7 +1579,7 @@ class Title { * @return Array list of errors */ private function checkUserBlock( $action, $user, $errors, $doExpensiveQueries, $short ) { - if( $short && count( $errors ) > 0 ) { + if( !$doExpensiveQueries ) { return $errors; } @@ -1539,8 +1589,14 @@ class Title { $errors[] = array( 'confirmedittext' ); } - // Edit blocks should not affect reading. Account creation blocks handled at userlogin. - if ( $action != 'read' && $action != 'createaccount' && $user->isBlockedFrom( $this ) ) { + if ( in_array( $action, array( 'read', 'createaccount', 'unblock' ) ) ){ + // Edit blocks should not affect reading. + // Account creation blocks handled at userlogin. + // Unblocking handled in SpecialUnblock + } elseif( ( $action == 'edit' || $action == 'create' ) && !$user->isBlockedFrom( $this ) ){ + // Don't block the user from editing their own talk page unless they've been + // explicitly blocked from that too. + } elseif( $user->isBlocked() && $user->mBlock->prevents( $action ) !== false ) { $block = $user->mBlock; // This is from OutputPage::blockedPage @@ -1551,7 +1607,7 @@ class Title { if ( $reason == '' ) { $reason = wfMsg( 'blockednoreason' ); } - $ip = wfGetIP(); + $ip = $user->getRequest()->getIP(); if ( is_numeric( $id ) ) { $name = User::whoIs( $id ); @@ -1560,29 +1616,16 @@ class Title { } $link = '[[' . $wgContLang->getNsText( NS_USER ) . ":{$name}|{$name}]]"; - $blockid = $block->mId; + $blockid = $block->getId(); $blockExpiry = $user->mBlock->mExpiry; $blockTimestamp = $wgLang->timeanddate( wfTimestamp( TS_MW, $user->mBlock->mTimestamp ), true ); if ( $blockExpiry == 'infinity' ) { - // Entry in database (table ipblocks) is 'infinity' but 'ipboptions' uses 'infinite' or 'indefinite' - $scBlockExpiryOptions = wfMsg( 'ipboptions' ); - - foreach ( explode( ',', $scBlockExpiryOptions ) as $option ) { - if ( !strpos( $option, ':' ) ) - continue; - - list( $show, $value ) = explode( ':', $option ); - - if ( $value == 'infinite' || $value == 'indefinite' ) { - $blockExpiry = $show; - break; - } - } + $blockExpiry = wfMessage( 'infiniteblock' )->text(); } else { $blockExpiry = $wgLang->timeanddate( wfTimestamp( TS_MW, $blockExpiry ), true ); } - $intended = $user->mBlock->mAddress; + $intended = strval( $user->mBlock->getTarget() ); $errors[] = array( ( $block->mAuto ? 'autoblockedtext' : 'blockedtext' ), $link, $reason, $ip, $name, $blockid, $blockExpiry, $intended, $blockTimestamp ); @@ -1678,10 +1721,10 @@ class Title { $dbw = wfGetDB( DB_MASTER ); - $encodedExpiry = Block::encodeExpiry( $expiry, $dbw ); + $encodedExpiry = $dbw->encodeExpiry( $expiry ); $expiry_description = ''; - if ( $encodedExpiry != 'infinity' ) { + if ( $encodedExpiry != $dbw->getInfinity() ) { $expiry_description = ' (' . wfMsgForContent( 'protect-expiring', $wgContLang->timeanddate( $expiry ), $wgContLang->date( $expiry ) , $wgContLang->time( $expiry ) ) . ')'; } else { @@ -1694,7 +1737,7 @@ class Title { 'pt_namespace' => $namespace, 'pt_title' => $title, 'pt_create_perm' => $create_perm, - 'pt_timestamp' => Block::encodeExpiry( wfTimestampNow(), $dbw ), + 'pt_timestamp' => $dbw->encodeExpiry( wfTimestampNow() ), 'pt_expiry' => $encodedExpiry, 'pt_user' => $wgUser->getId(), 'pt_reason' => $reason, @@ -1743,7 +1786,14 @@ class Title { * @return Bool TRUE or FALSE */ public function isMovable() { - return MWNamespace::isMovable( $this->getNamespace() ) && $this->getInterwiki() == ''; + if ( !MWNamespace::isMovable( $this->getNamespace() ) || $this->getInterwiki() != '' ) { + // Interwiki title or immovable namespace. Hooks don't get to override here + return false; + } + + $result = true; + wfRunHooks( 'TitleIsMovable', array( $this, &$result ) ); + return $result; } /** @@ -1765,7 +1815,7 @@ class Title { # 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 @@ -1797,47 +1847,36 @@ class Title { } else { global $wgWhitelistRead; - /** - * Always grant access to the login page. - * Even anons need to be able to log in. - */ - if ( $this->isSpecial( 'Userlogin' ) || $this->isSpecial( 'Resetpass' ) ) { + # Always grant access to the login page. + # Even anons need to be able to log in. + if ( $this->isSpecial( 'Userlogin' ) || $this->isSpecial( 'ChangePassword' ) ) { return true; } - /** - * Bail out if there isn't whitelist - */ + # Bail out if there isn't whitelist if ( !is_array( $wgWhitelistRead ) ) { return false; } - /** - * Check for explicit whitelisting - */ + # Check for explicit whitelisting $name = $this->getPrefixedText(); $dbName = $this->getPrefixedDBKey(); // Check with and without underscores if ( in_array( $name, $wgWhitelistRead, true ) || in_array( $dbName, $wgWhitelistRead, true ) ) return true; - /** - * Old settings might have the title prefixed with - * a colon for main-namespace pages - */ + # Old settings might have the title prefixed with + # a colon for main-namespace pages if ( $this->getNamespace() == NS_MAIN ) { if ( in_array( ':' . $name, $wgWhitelistRead ) ) { return true; } } - /** - * If it's a special page, ditch the subpage bit - * and check again - */ + # If it's a special page, ditch the subpage bit and check again if ( $this->getNamespace() == NS_SPECIAL ) { $name = $this->getDBkey(); - list( $name, /* $subpage */ ) = SpecialPage::resolveAliasWithSubpage( $name ); + list( $name, /* $subpage */ ) = SpecialPageFactory::resolveAlias( $name ); if ( $name === false ) { # Invalid special page, but we show standard login required message return false; @@ -1859,7 +1898,7 @@ class Title { * cache that we don't need to over-optimize by doing direct comparisons and * acidentally creating new bugs where $title->equals( Title::newFromText() ) * ends up reporting something differently than $title->isMainPage(); - * + * * @return Bool */ public function isMainPage() { @@ -1941,6 +1980,17 @@ class Title { ); } + /** + * Does that page contain wikitext, or it is JS, CSS or whatever? + * + * @return Bool + */ + public function isWikitextPage() { + $retval = !$this->isCssOrJsPage() && !$this->isCssJsSubpage(); + wfRunHooks( 'TitleIsWikitextPage', array( $this, &$retval ) ); + return $retval; + } + /** * Could this page contain custom CSS or JavaScript, based * on the title? @@ -1948,8 +1998,10 @@ class Title { * @return Bool */ public function isCssOrJsPage() { - return $this->mNamespace == NS_MEDIAWIKI + $retval = $this->mNamespace == NS_MEDIAWIKI && preg_match( '!\.(?:css|js)$!u', $this->mTextform ) > 0; + wfRunHooks( 'TitleIsCssOrJsPage', array( $this, &$retval ) ); + return $retval; } /** @@ -1964,7 +2016,7 @@ class Title { * Is this a *valid* .css or .js subpage of a user page? * * @return Bool - * @deprecated + * @deprecated since 1.17 */ public function isValidCssJsSubpage() { return $this->isCssJsSubpage(); @@ -2003,12 +2055,13 @@ class Title { * Protect css subpages of user pages: can $wgUser edit * this page? * + * @deprecated in 1.19; will be removed in 1.20. Use getUserPermissionsErrors() instead. * @return Bool - * @todo XXX: this might be better using restrictions */ public function userCanEditCssSubpage() { global $wgUser; - return ( ( $wgUser->isAllowed( 'editusercssjs' ) && $wgUser->isAllowed( 'editusercss' ) ) + wfDeprecated( __METHOD__ ); + return ( ( $wgUser->isAllowedAll( 'editusercssjs', 'editusercss' ) ) || preg_match( '/^' . preg_quote( $wgUser->getName(), '/' ) . '\//', $this->mTextform ) ); } @@ -2016,13 +2069,14 @@ class Title { * Protect js subpages of user pages: can $wgUser edit * this page? * + * @deprecated in 1.19; will be removed in 1.20. Use getUserPermissionsErrors() instead. * @return Bool - * @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 ) ); + wfDeprecated( __METHOD__ ); + return ( ( $wgUser->isAllowedAll( 'editusercssjs', 'edituserjs' ) ) + || preg_match( '/^' . preg_quote( $wgUser->getName(), '/' ) . '\//', $this->mTextform ) ); } /** @@ -2040,18 +2094,18 @@ class Title { * * @param $getPages Bool Whether or not to retrieve the actual pages * that the restrictions have come from. - * @return Mixed Array of the Title - * objects of the pages from which cascading restrictions have come, - * false for none, or true if such restrictions exist, but $getPages was not set. - * The restriction array is an array of each type, each of which contains a - * array of unique groups. + * @return Mixed Array of Title objects of the pages from which cascading restrictions + * have come, false for none, or true if such restrictions exist, but $getPages + * was not set. The restriction array is an array of each type, each of which + * contains a array of unique groups. */ public function getCascadeProtectionSources( $getPages = true ) { + global $wgContLang; $pagerestrictions = array(); if ( isset( $this->mCascadeSources ) && $getPages ) { return array( $this->mCascadeSources, $this->mCascadingRestrictions ); - } else if ( isset( $this->mHasCascadingRestrictions ) && !$getPages ) { + } elseif ( isset( $this->mHasCascadingRestrictions ) && !$getPages ) { return array( $this->mHasCascadingRestrictions, $pagerestrictions ); } @@ -2092,7 +2146,7 @@ class Title { $purgeExpired = false; foreach ( $res as $row ) { - $expiry = Block::decodeExpiry( $row->pr_expiry ); + $expiry = $wgContLang->formatExpiry( $row->pr_expiry, TS_MW ); if ( $expiry > $now ) { if ( $getPages ) { $page_id = $row->pr_page; @@ -2122,8 +2176,6 @@ class Title { Title::purgeExpiredRestrictions(); } - wfProfileOut( __METHOD__ ); - if ( $getPages ) { $this->mCascadeSources = $sources; $this->mCascadingRestrictions = $pagerestrictions; @@ -2131,6 +2183,7 @@ class Title { $this->mHasCascadingRestrictions = $sources; } + wfProfileOut( __METHOD__ ); return array( $sources, $pagerestrictions ); } @@ -2151,7 +2204,7 @@ class Title { * Loads a string into mRestrictions array * * @param $res Resource restrictions as an SQL result. - * @param $oldFashionedRestrictions string comma-separated list of page + * @param $oldFashionedRestrictions String comma-separated list of page * restrictions from page table (pre 1.10) */ private function loadRestrictionsFromResultWrapper( $res, $oldFashionedRestrictions = null ) { @@ -2174,13 +2227,14 @@ class Title { * restrictions from page table (pre 1.10) */ public function loadRestrictionsFromRows( $rows, $oldFashionedRestrictions = null ) { + global $wgContLang; $dbr = wfGetDB( DB_SLAVE ); $restrictionTypes = $this->getRestrictionTypes(); foreach ( $restrictionTypes as $type ) { $this->mRestrictions[$type] = array(); - $this->mRestrictionsExpiry[$type] = Block::decodeExpiry( '' ); + $this->mRestrictionsExpiry[$type] = $wgContLang->formatExpiry( '', TS_MW ); } $this->mCascadeRestriction = false; @@ -2214,17 +2268,16 @@ class Title { $now = wfTimestampNow(); $purgeExpired = false; + # Cycle through all the restrictions. foreach ( $rows as $row ) { - # Cycle through all the restrictions. // 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, // But I don't really see any harm in leaving it in Block for now -werdna - $expiry = Block::decodeExpiry( $row->pr_expiry ); + $expiry = $wgContLang->formatExpiry( $row->pr_expiry, TS_MW ); // Only apply the restrictions if they haven't expired! if ( !$expiry || $expiry > $now ) { @@ -2249,16 +2302,21 @@ class Title { /** * Load restrictions from the page_restrictions table * - * @param $oldFashionedRestrictions string comma-separated list of page + * @param $oldFashionedRestrictions String comma-separated list of page * restrictions from page table (pre 1.10) */ public function loadRestrictions( $oldFashionedRestrictions = null ) { + global $wgContLang; if ( !$this->mRestrictionsLoaded ) { if ( $this->exists() ) { $dbr = wfGetDB( DB_SLAVE ); - $res = $dbr->select( 'page_restrictions', '*', - array( 'pr_page' => $this->getArticleId() ), __METHOD__ ); + $res = $dbr->select( + 'page_restrictions', + '*', + array( 'pr_page' => $this->getArticleId() ), + __METHOD__ + ); $this->loadRestrictionsFromResultWrapper( $res, $oldFashionedRestrictions ); } else { @@ -2266,7 +2324,7 @@ class Title { if ( $title_protection ) { $now = wfTimestampNow(); - $expiry = Block::decodeExpiry( $title_protection['pt_expiry'] ); + $expiry = $wgContLang->formatExpiry( $title_protection['pt_expiry'], TS_MW ); if ( !$expiry || $expiry > $now ) { // Apply the restrictions @@ -2277,7 +2335,7 @@ class Title { $this->mTitleProtection = false; } } else { - $this->mRestrictionsExpiry['create'] = Block::decodeExpiry( '' ); + $this->mRestrictionsExpiry['create'] = $wgContLang->formatExpiry( '', TS_MW ); } $this->mRestrictionsLoaded = true; } @@ -2320,7 +2378,7 @@ class Title { /** * Get the expiry time for the restriction against a given action * - * @return 14-char timestamp, or 'infinity' if the page is protected forever + * @return String|Bool 14-char timestamp, or 'infinity' if the page is protected forever * or not protected at all, or false if the action is not recognised. */ public function getRestrictionExpiry( $action ) { @@ -2333,20 +2391,37 @@ class Title { /** * Is there a version of this page in the deletion archive? * + * @param $includeSuppressed Boolean Include suppressed revisions? * @return Int the number of archived revisions */ - public function isDeleted() { + public function isDeleted( $includeSuppressed = false ) { if ( $this->getNamespace() < 0 ) { $n = 0; } else { $dbr = wfGetDB( DB_SLAVE ); + $conditions = array( 'ar_namespace' => $this->getNamespace(), 'ar_title' => $this->getDBkey() ); + + if( !$includeSuppressed ) { + $suppressedTextBits = Revision::DELETED_TEXT | Revision::DELETED_RESTRICTED; + $conditions[] = $dbr->bitAnd('ar_deleted', $suppressedTextBits ) . + ' != ' . $suppressedTextBits; + } + $n = $dbr->selectField( 'archive', 'COUNT(*)', - array( 'ar_namespace' => $this->getNamespace(), 'ar_title' => $this->getDBkey() ), + $conditions, __METHOD__ ); if ( $this->getNamespace() == NS_FILE ) { - $n += $dbr->selectField( 'filearchive', 'COUNT(*)', - array( 'fa_name' => $this->getDBkey() ), + $fconditions = array( 'fa_name' => $this->getDBkey() ); + if( !$includeSuppressed ) { + $suppressedTextBits = File::DELETED_FILE | File::DELETED_RESTRICTED; + $fconditions[] = $dbr->bitAnd('fa_deleted', $suppressedTextBits ) . + ' != ' . $suppressedTextBits; + } + + $n += $dbr->selectField( 'filearchive', + 'COUNT(*)', + $fconditions, __METHOD__ ); } @@ -2477,7 +2552,7 @@ class Title { */ public function resetArticleID( $newid ) { $linkCache = LinkCache::singleton(); - $linkCache->clearBadLink( $this->getPrefixedDBkey() ); + $linkCache->clearLink( $this ); if ( $newid === false ) { $this->mArticleID = -1; @@ -2519,11 +2594,12 @@ class Title { * @return String the prefixed text * @private */ - /* private */ function prefix( $name ) { + private function prefix( $name ) { $p = ''; if ( $this->mInterwiki != '' ) { $p = $this->mInterwiki . ':'; } + if ( 0 != $this->mNamespace ) { $p .= $this->getNsText() . ':'; } @@ -2535,7 +2611,7 @@ class Title { * 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. * - * @return string regex string + * @return String regex string */ static function getTitleInvalidRegex() { static $rxTc = false; @@ -2560,7 +2636,7 @@ class Title { /** * Capitalize a text string for a title if it belongs to a namespace that capitalizes * - * @param $text string containing title to capitalize + * @param $text String containing title to capitalize * @param $ns int namespace index, defaults to NS_MAIN * @return String containing capitalized title */ @@ -2589,8 +2665,6 @@ class Title { global $wgContLang, $wgLocalInterwiki; # Initialisation - $rxTc = self::getTitleInvalidRegex(); - $this->mInterwiki = $this->mFragment = ''; $this->mNamespace = $this->mDefaultNamespace; # Usually NS_MAIN @@ -2605,7 +2679,6 @@ class Title { # 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( '/[ _\xA0\x{1680}\x{180E}\x{2000}-\x{200A}\x{2028}\x{2029}\x{202F}\x{205F}\x{3000}]+/u', '_', $dbkey ); $dbkey = trim( $dbkey, '_' ); @@ -2622,7 +2695,7 @@ class Title { # Initial colon indicates main namespace rather than specified default # but should not create invalid {ns,title} pairs such as {0,Project:Foo} - if ( ':' == $dbkey { 0 } ) { + if ( ':' == $dbkey[0] ) { $this->mNamespace = NS_MAIN; $dbkey = substr( $dbkey, 1 ); # remove the colon but continue processing $dbkey = trim( $dbkey, '_' ); # remove any subsequent whitespace @@ -2642,9 +2715,11 @@ class Title { # For Talk:X pages, check if X has a "namespace" prefix if ( $ns == NS_TALK && preg_match( $prefixRegexp, $dbkey, $x ) ) { if ( $wgContLang->getNsIndex( $x[1] ) ) { - return false; # Disallow Talk:File:x type titles... - } else if ( Interwiki::isValidInterwiki( $x[1] ) ) { - return false; # Disallow Talk:Interwiki:x type titles... + # Disallow Talk:File:x type titles... + return false; + } elseif ( Interwiki::isValidInterwiki( $x[1] ) ) { + # Disallow Talk:Interwiki:x type titles... + return false; } } } elseif ( Interwiki::isValidInterwiki( $p ) ) { @@ -2660,7 +2735,7 @@ class Title { # Redundant interwiki prefix to the local wiki if ( $wgLocalInterwiki !== false - && 0 == strcasecmp( $this->mInterwiki, $wgLocalInterwiki ) ) + && 0 == strcasecmp( $this->mInterwiki, $wgLocalInterwiki ) ) { if ( $dbkey == '' ) { # Can't have an empty self-link @@ -2686,13 +2761,12 @@ class Title { } while ( true ); # We already know that some pages won't be in the database! - # if ( $this->mInterwiki != '' || NS_SPECIAL == $this->mNamespace ) { $this->mArticleID = 0; } $fragment = strstr( $dbkey, '#' ); if ( false !== $fragment ) { - $this->setFragment( preg_replace( '/^#_*/', '#', $fragment ) ); + $this->setFragment( $fragment ); $dbkey = substr( $dbkey, 0, strlen( $dbkey ) - strlen( $fragment ) ); # remove whitespace again: prevents "Foo_bar_#" # becoming "Foo_bar_" @@ -2700,79 +2774,65 @@ class Title { } # Reject illegal characters. - # + $rxTc = self::getTitleInvalidRegex(); if ( preg_match( $rxTc, $dbkey ) ) { return false; } - /** - * Pages with "/./" or "/../" appearing in the URLs will often be un- - * reachable due to the way web browsers deal with 'relative' URLs. - * Also, they conflict with subpage syntax. Forbid them explicitly. - */ + # Pages with "/./" or "/../" appearing in the URLs will often be un- + # reachable due to the way web browsers deal with 'relative' URLs. + # Also, they conflict with subpage syntax. Forbid them explicitly. if ( strpos( $dbkey, '.' ) !== false && - ( $dbkey === '.' || $dbkey === '..' || - strpos( $dbkey, './' ) === 0 || - strpos( $dbkey, '../' ) === 0 || - strpos( $dbkey, '/./' ) !== false || - strpos( $dbkey, '/../' ) !== false || - substr( $dbkey, -2 ) == '/.' || - substr( $dbkey, -3 ) == '/..' ) ) + ( $dbkey === '.' || $dbkey === '..' || + strpos( $dbkey, './' ) === 0 || + strpos( $dbkey, '../' ) === 0 || + strpos( $dbkey, '/./' ) !== false || + strpos( $dbkey, '/../' ) !== false || + substr( $dbkey, -2 ) == '/.' || + substr( $dbkey, -3 ) == '/..' ) ) { return false; } - /** - * Magic tilde sequences? Nu-uh! - */ + # Magic tilde sequences? Nu-uh! if ( strpos( $dbkey, '~~~' ) !== false ) { return false; } - /** - * 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 - * for long titles, e.g. [[Special:Block/Long name]] - */ + # 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 for long titles, e.g. [[Special:Block/Long name]] if ( ( $this->mNamespace != NS_SPECIAL && strlen( $dbkey ) > 255 ) || strlen( $dbkey ) > 512 ) { return false; } - /** - * 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. - */ + # 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. $this->mUserCaseDBKey = $dbkey; if ( $this->mInterwiki == '' ) { $dbkey = self::capitalize( $dbkey, $this->mNamespace ); } - /** - * Can't make a link to a namespace alone... - * "empty" local links can only be self-links - * with a fragment identifier. - */ - if ( $dbkey == '' && - $this->mInterwiki == '' && - $this->mNamespace != NS_MAIN ) { + # Can't make a link to a namespace alone... "empty" local links can only be + # self-links with a fragment identifier. + if ( $dbkey == '' && $this->mInterwiki == '' && $this->mNamespace != NS_MAIN ) { 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 // inconsistent. Same for talk/userpages. Keep them normalized instead. - $dbkey = ( $this->mNamespace == NS_USER || $this->mNamespace == NS_USER_TALK ) ? - IP::sanitizeIP( $dbkey ) : $dbkey; + $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; @@ -2801,6 +2861,10 @@ class Title { $this->mFragment = str_replace( '_', ' ', substr( $fragment, 1 ) ); } + public function setInterwiki( $interwiki ) { + $this->mInterwiki = $interwiki; + } + /** * Get a Title object associated with the talk page of this article * @@ -3008,28 +3072,13 @@ class Title { } if ( ( $this->getDBkey() == '' ) || ( !$oldid ) || - ( $nt->getDBkey() == '' ) ) { + ( $nt->getDBkey() == '' ) ) { $errors[] = array( 'badarticleerror' ); } // Image-specific checks if ( $this->getNamespace() == NS_FILE ) { - if ( $nt->getNamespace() != NS_FILE ) { - $errors[] = array( 'imagenocrossnamespace' ); - } - $file = wfLocalFile( $this ); - if ( $file->exists() ) { - if ( $nt->getText() != wfStripIllegalFilenameChars( $nt->getText() ) ) { - $errors[] = array( 'imageinvalidfilename' ); - } - if ( !File::checkExtensionCompatibility( $file, $nt->getDBkey() ) ) { - $errors[] = array( 'imagetypemismatch' ); - } - } - $destfile = wfLocalFile( $nt ); - if ( !$wgUser->isAllowed( 'reupload-shared' ) && !$destfile->exists() && wfFindFile( $nt ) ) { - $errors[] = array( 'file-exists-sharedrepo' ); - } + $errors = array_merge( $errors, $this->validateFileMoveOperation( $nt ) ); } if ( $nt->getNamespace() == NS_FILE && $this->getNamespace() != NS_FILE ) { @@ -3076,24 +3125,59 @@ class Title { return $errors; } + /** + * Check if the requested move target is a valid file move target + * @param Title $nt Target title + * @return array List of errors + */ + protected function validateFileMoveOperation( $nt ) { + global $wgUser; + + $errors = array(); + + if ( $nt->getNamespace() != NS_FILE ) { + $errors[] = array( 'imagenocrossnamespace' ); + } + + $file = wfLocalFile( $this ); + if ( $file->exists() ) { + if ( $nt->getText() != wfStripIllegalFilenameChars( $nt->getText() ) ) { + $errors[] = array( 'imageinvalidfilename' ); + } + if ( !File::checkExtensionCompatibility( $file, $nt->getDBkey() ) ) { + $errors[] = array( 'imagetypemismatch' ); + } + } + + $destFile = wfLocalFile( $nt ); + if ( !$wgUser->isAllowed( 'reupload-shared' ) && !$destFile->exists() && wfFindFile( $nt ) ) { + $errors[] = array( 'file-exists-sharedrepo' ); + } + + return $errors; + } + /** * Move a title to a new location * * @param $nt Title the new title * @param $auth Bool indicates whether $wgUser's permissions * should be checked - * @param $reason String The reason for the move + * @param $reason String the reason for the move * @param $createRedirect Bool 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, getUserPermissionsErrors()-like array on failure */ public function moveTo( &$nt, $auth = true, $reason = '', $createRedirect = true ) { + global $wgEnableInterwikiTemplatesTracking, $wgGlobalDatabase; + $err = $this->isValidMoveOperation( $nt, $auth, $reason ); if ( is_array( $err ) ) { return $err; } - // If it is a file, move it first. It is done before all other moving stuff is done because it's hard to revert + // If it is a file, move 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 ); @@ -3105,13 +3189,16 @@ class Title { } } - $pageid = $this->getArticleID(); + $dbw->begin(); # If $file was a LocalFile, its transaction would have closed our own. + $pageid = $this->getArticleID( self::GAID_FOR_UPDATE ); $protected = $this->isProtected(); $pageCountChange = ( $createRedirect ? 1 : 0 ) - ( $nt->exists() ? 1 : 0 ); // Do the actual move - $err = $this->moveToInternal( $nt, $reason, $createRedirect ); + $err = $this->moveOverExistingRedirect( $nt, $reason, $createRedirect ); if ( is_array( $err ) ) { + # @todo FIXME: What about the File we have already moved? + $dbw->rollback(); return $err; } @@ -3119,19 +3206,35 @@ class Title { // Refresh the sortkey for this row. Be careful to avoid resetting // cl_timestamp, which may disturb time-based lists on some sites. - $prefix = $dbw->selectField( + $prefixes = $dbw->select( 'categorylinks', - 'cl_sortkey_prefix', + array( 'cl_sortkey_prefix', 'cl_to' ), array( 'cl_from' => $pageid ), __METHOD__ ); - $dbw->update( 'categorylinks', - array( - 'cl_sortkey' => Collation::singleton()->getSortKey( - $nt->getCategorySortkey( $prefix ) ), - 'cl_timestamp=cl_timestamp' ), - array( 'cl_from' => $pageid ), - __METHOD__ ); + foreach ( $prefixes as $prefixRow ) { + $prefix = $prefixRow->cl_sortkey_prefix; + $catTo = $prefixRow->cl_to; + $dbw->update( 'categorylinks', + array( + 'cl_sortkey' => Collation::singleton()->getSortKey( + $nt->getCategorySortkey( $prefix ) ), + 'cl_timestamp=cl_timestamp' ), + array( + 'cl_from' => $pageid, + 'cl_to' => $catTo ), + __METHOD__ + ); + } + + if ( $wgEnableInterwikiTemplatesTracking && $wgGlobalDatabase ) { + $dbw2 = wfGetDB( DB_MASTER, array(), $wgGlobalDatabase ); + $dbw2->update( 'globaltemplatelinks', + array( 'gtl_from_namespace' => $nt->getNamespace(), + 'gtl_from_title' => $nt->getText() ), + array ( 'gtl_from_page' => $pageid ), + __METHOD__ ); + } if ( $protected ) { # Protect the redirect title as the title used to be... @@ -3154,7 +3257,8 @@ class Title { if ( $reason ) { $comment .= wfMsgForContent( 'colon-separator' ) . $reason; } - $log->addEntry( 'move_prot', $nt, $comment, array( $this->getPrefixedText() ) ); // FIXME: $params? + // @todo FIXME: $params? + $log->addEntry( 'move_prot', $nt, $comment, array( $this->getPrefixedText() ) ); } # Update watchlists @@ -3173,6 +3277,8 @@ class Title { $u = new SearchUpdate( $redirid, $this->getPrefixedDBkey(), '' ); $u->doUpdate(); + $dbw->commit(); + # Update site_stats if ( $this->isContentPage() && !$nt->isContentPage() ) { # No longer a content page @@ -3192,21 +3298,21 @@ class Title { if ( $u ) { $u->doUpdate(); } + # Update message cache for interface messages - global $wgMessageCache; if ( $this->getNamespace() == NS_MEDIAWIKI ) { # @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 ); + MessageCache::singleton()->replace( $this->getDBkey(), false ); } else { $oldarticle = new Article( $this ); - $wgMessageCache->replace( $this->getDBkey(), $oldarticle->getContent() ); + MessageCache::singleton()->replace( $this->getDBkey(), $oldarticle->getContent() ); } } if ( $nt->getNamespace() == NS_MEDIAWIKI ) { $newarticle = new Article( $nt ); - $wgMessageCache->replace( $nt->getDBkey(), $newarticle->getContent() ); + MessageCache::singleton()->replace( $nt->getDBkey(), $newarticle->getContent() ); } global $wgUser; @@ -3218,15 +3324,13 @@ class Title { * Move page to a title which is either a redirect to the * source page or nonexistent * - * @param $nt Title the page to move to, which should - * be a redirect or nonexistent + * @param $nt Title the page to move to, which should be a redirect or nonexistent * @param $reason String The reason for the move - * @param $createRedirect Bool Whether to leave a - * redirect at the old title. Ignored if the user doesn't - * have the suppressredirect right + * @param $createRedirect Bool Whether to leave a redirect at the old title. Ignored + * if the user doesn't have the suppressredirect right */ - private function moveToInternal( &$nt, $reason = '', $createRedirect = true ) { - global $wgUser, $wgContLang; + private function moveOverExistingRedirect( &$nt, $reason = '', $createRedirect = true ) { + global $wgUser, $wgContLang, $wgEnableInterwikiTemplatesTracking, $wgGlobalDatabase; $moveOverRedirect = $nt->exists(); @@ -3236,8 +3340,8 @@ class Title { if ( $reason ) { $comment .= wfMsgForContent( 'colon-separator' ) . $reason; } - # Truncate for whole multibyte characters. +5 bytes for ellipsis - $comment = $wgContLang->truncate( $comment, 250 ); + # Truncate for whole multibyte characters. + $comment = $wgContLang->truncate( $comment, 255 ); $oldid = $this->getArticleID(); $latest = $this->getLatestRevID(); @@ -3269,12 +3373,21 @@ class Title { $dbw->delete( 'externallinks', array( 'el_from' => $newid ), __METHOD__ ); $dbw->delete( 'langlinks', array( 'll_from' => $newid ), __METHOD__ ); $dbw->delete( 'redirect', array( 'rd_from' => $newid ), __METHOD__ ); + $dbw->delete( 'page_props', array( 'pp_page' => $newid ), __METHOD__ ); } // If the target page 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__ ); + + if ( $wgEnableInterwikiTemplatesTracking && $wgGlobalDatabase ) { + $dbw2 = wfGetDB( DB_MASTER, array(), $wgGlobalDatabase ); + $dbw2->delete( 'globaltemplatelinks', + array( 'gtl_from_wiki' => wfGetID(), + 'gtl_from_page' => $newid ), + __METHOD__ ); + } } # Save a null revision in the page's history notifying of the move @@ -3284,13 +3397,11 @@ class Title { } $nullRevId = $nullRevision->insertOn( $dbw ); - $article = new Article( $this ); - wfRunHooks( 'NewRevisionFromEditComplete', array( $article, $nullRevision, $latest, $wgUser ) ); - + $now = wfTimestampNow(); # Change the name of the target page: $dbw->update( 'page', /* SET */ array( - 'page_touched' => $dbw->timestamp(), + 'page_touched' => $dbw->timestamp( $now ), 'page_namespace' => $nt->getNamespace(), 'page_title' => $nt->getDBkey(), 'page_latest' => $nullRevId, @@ -3300,30 +3411,38 @@ class Title { ); $nt->resetArticleID( $oldid ); + $article = new Article( $nt ); + wfRunHooks( 'NewRevisionFromEditComplete', + array( $article, $nullRevision, $latest, $wgUser ) ); + $article->setCachedLastEditTime( $now ); + # Recreate the redirect, this time in the other direction. if ( $createRedirect || !$wgUser->isAllowed( 'suppressredirect' ) ) { $mwRedir = MagicWord::get( 'redirect' ); $redirectText = $mwRedir->getSynonym( 0 ) . ' [[' . $nt->getPrefixedText() . "]]\n"; $redirectArticle = new Article( $this ); $newid = $redirectArticle->insertOn( $dbw ); - $redirectRevision = new Revision( array( - 'page' => $newid, - 'comment' => $comment, - 'text' => $redirectText ) ); - $redirectRevision->insertOn( $dbw ); - $redirectArticle->updateRevisionOn( $dbw, $redirectRevision, 0 ); - - wfRunHooks( 'NewRevisionFromEditComplete', array( $redirectArticle, $redirectRevision, false, $wgUser ) ); - - # 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 ), __METHOD__ ); - $dbw->insert( 'pagelinks', - array( - 'pl_from' => $newid, - 'pl_namespace' => $nt->getNamespace(), - 'pl_title' => $nt->getDBkey() ), - __METHOD__ ); + if ( $newid ) { // sanity + $redirectRevision = new Revision( array( + 'page' => $newid, + 'comment' => $comment, + 'text' => $redirectText ) ); + $redirectRevision->insertOn( $dbw ); + $redirectArticle->updateRevisionOn( $dbw, $redirectRevision, 0 ); + + wfRunHooks( 'NewRevisionFromEditComplete', + array( $redirectArticle, $redirectRevision, false, $wgUser ) ); + + # 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 ), __METHOD__ ); + $dbw->insert( 'pagelinks', + array( + 'pl_from' => $newid, + 'pl_namespace' => $nt->getNamespace(), + 'pl_title' => $nt->getDBkey() ), + __METHOD__ ); + } $redirectSuppressed = false; } else { $this->resetArticleID( 0 ); @@ -3352,10 +3471,11 @@ class Title { * @param $nt Title Move target * @param $auth bool Whether $wgUser's permissions should be checked * @param $reason string The reason for the move - * @param $createRedirect bool Whether to create redirects from the old subpages to the new ones - * Ignored if the user doesn't have the 'suppressredirect' right + * @param $createRedirect bool Whether to create redirects from the old subpages to + * the new ones Ignored if the user doesn't have the 'suppressredirect' right * @return mixed array with old page titles as keys, and strings (new page titles) or - * arrays (errors) as values, or an error array with numeric indices if no pages were moved + * 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 $wgMaximumMovedPages; @@ -3460,7 +3580,7 @@ class Title { * - Selects for update, so don't call it unless you mean business * * @param $nt Title the new title to check - * @return Bool TRUE or FALSE + * @return Bool */ public function isValidMoveTarget( $nt ) { # Is it an existing file? @@ -3512,23 +3632,28 @@ class Title { * categories' names. * * @return Array of parents in the form: - * $parent => $currentarticle + * $parent => $currentarticle */ public function getParentCategories() { global $wgContLang; - $titlekey = $this->getArticleId(); + $data = array(); + + $titleKey = $this->getArticleId(); + + if ( $titleKey === 0 ) { + return $data; + } + $dbr = wfGetDB( DB_SLAVE ); $res = $dbr->select( 'categorylinks', '*', array( 'cl_from' => $titleKey, - "cl_from <> '0'", ), __METHOD__, - array( 'ORDER BY' => 'cl_sortkey' ) + array() ); - $data = array(); if ( $dbr->numRows( $res ) > 0 ) { foreach ( $res as $row ) { @@ -3566,12 +3691,11 @@ class Title { return $stack; } - /** * Get an associative array for selecting this title from * the "page" table * - * @return Array Selection array + * @return Array suitable for the $where parameter of DB::select() */ public function pageCond() { if ( $this->mArticleID > 0 ) { @@ -3587,7 +3711,7 @@ class Title { * * @param $revId Int Revision ID. Get the revision that was before this one. * @param $flags Int Title::GAID_FOR_UPDATE - * @return \twotypes{\int,\bool} Old revision ID, or FALSE if none exists + * @return Int|Bool Old revision ID, or FALSE if none exists */ public function getPreviousRevisionID( $revId, $flags = 0 ) { $db = ( $flags & self::GAID_FOR_UPDATE ) ? wfGetDB( DB_MASTER ) : wfGetDB( DB_SLAVE ); @@ -3606,7 +3730,7 @@ class Title { * * @param $revId Int Revision ID. Get the revision that was after this one. * @param $flags Int Title::GAID_FOR_UPDATE - * @return \twotypes{\int,\bool} Next revision ID, or FALSE if none exists + * @return Int|Bool Next revision ID, or FALSE if none exists */ public function getNextRevisionID( $revId, $flags = 0 ) { $db = ( $flags & self::GAID_FOR_UPDATE ) ? wfGetDB( DB_MASTER ) : wfGetDB( DB_SLAVE ); @@ -3624,68 +3748,71 @@ class Title { * Get the first revision of the page * * @param $flags Int Title::GAID_FOR_UPDATE - * @return Revision (or NULL if page doesn't exist) + * @return Revision|Null if page doesn't exist */ public function getFirstRevision( $flags = 0 ) { - $db = ( $flags & self::GAID_FOR_UPDATE ) ? wfGetDB( DB_MASTER ) : wfGetDB( DB_SLAVE ); $pageId = $this->getArticleId( $flags ); - if ( !$pageId ) { - return null; - } - $row = $db->selectRow( 'revision', '*', - array( 'rev_page' => $pageId ), - __METHOD__, - array( 'ORDER BY' => 'rev_timestamp ASC', 'LIMIT' => 1 ) - ); - if ( !$row ) { - return null; - } else { - return new Revision( $row ); + if ( $pageId ) { + $db = ( $flags & self::GAID_FOR_UPDATE ) ? wfGetDB( DB_MASTER ) : wfGetDB( DB_SLAVE ); + $row = $db->selectRow( 'revision', '*', + array( 'rev_page' => $pageId ), + __METHOD__, + array( 'ORDER BY' => 'rev_timestamp ASC', 'LIMIT' => 1 ) + ); + if ( $row ) { + return new Revision( $row ); + } } + return null; } /** - * Check if this is a new page + * Get the oldest revision timestamp of this page * - * @return bool + * @param $flags Int Title::GAID_FOR_UPDATE + * @return String: MW timestamp */ - public function isNewPage() { - $dbr = wfGetDB( DB_SLAVE ); - return (bool)$dbr->selectField( 'page', 'page_is_new', $this->pageCond(), __METHOD__ ); + public function getEarliestRevTime( $flags = 0 ) { + $rev = $this->getFirstRevision( $flags ); + return $rev ? $rev->getTimestamp() : null; } /** - * Get the oldest revision timestamp of this page + * Check if this is a new page * - * @return String: MW timestamp + * @return bool */ - public function getEarliestRevTime() { + public function isNewPage() { $dbr = wfGetDB( DB_SLAVE ); - if ( $this->exists() ) { - $min = $dbr->selectField( 'revision', - 'MIN(rev_timestamp)', - array( 'rev_page' => $this->getArticleId() ), - __METHOD__ ); - return wfTimestampOrNull( TS_MW, $min ); - } - return null; + return (bool)$dbr->selectField( 'page', 'page_is_new', $this->pageCond(), __METHOD__ ); } /** - * Get the number of revisions between the given revision IDs. + * Get the number of revisions between the given revision. * Used for diffs and other things that really need it. * - * @param $old Int Revision ID. - * @param $new Int Revision ID. - * @return Int Number of revisions between these IDs. + * @param $old int|Revision Old revision or rev ID (first before range) + * @param $new int|Revision New revision or rev ID (first after range) + * @return Int Number of revisions between these revisions. */ public function countRevisionsBetween( $old, $new ) { + if ( !( $old instanceof Revision ) ) { + $old = Revision::newFromTitle( $this, (int)$old ); + } + if ( !( $new instanceof Revision ) ) { + $new = Revision::newFromTitle( $this, (int)$new ); + } + if ( !$old || !$new ) { + return 0; // nothing to compare + } $dbr = wfGetDB( DB_SLAVE ); - return (int)$dbr->selectField( 'revision', 'count(*)', array( - 'rev_page' => intval( $this->getArticleId() ), - 'rev_id > ' . intval( $old ), - 'rev_id < ' . intval( $new ) - ), __METHOD__ + return (int)$dbr->selectField( 'revision', 'count(*)', + array( + 'rev_page' => $this->getArticleId(), + 'rev_timestamp > ' . $dbr->addQuotes( $dbr->timestamp( $old->getTimestamp() ) ), + 'rev_timestamp < ' . $dbr->addQuotes( $dbr->timestamp( $new->getTimestamp() ) ) + ), + __METHOD__ ); } @@ -3693,30 +3820,38 @@ class Title { * Get the number of authors between the given revision IDs. * Used for diffs and other things that really need it. * - * @param $fromRevId Int Revision ID (first before range) - * @param $toRevId Int Revision ID (first after range) + * @param $old int|Revision Old revision or rev ID (first before range) + * @param $new int|Revision New revision or rev ID (first after range) * @param $limit Int Maximum number of authors - * @param $flags Int Title::GAID_FOR_UPDATE - * @return Int + * @return Int Number of revision authors between these revisions. */ - public function countAuthorsBetween( $fromRevId, $toRevId, $limit, $flags = 0 ) { - $db = ( $flags & self::GAID_FOR_UPDATE ) ? wfGetDB( DB_MASTER ) : wfGetDB( DB_SLAVE ); - $res = $db->select( 'revision', 'DISTINCT rev_user_text', + public function countAuthorsBetween( $old, $new, $limit ) { + if ( !( $old instanceof Revision ) ) { + $old = Revision::newFromTitle( $this, (int)$old ); + } + if ( !( $new instanceof Revision ) ) { + $new = Revision::newFromTitle( $this, (int)$new ); + } + if ( !$old || !$new ) { + return 0; // nothing to compare + } + $dbr = wfGetDB( DB_SLAVE ); + $res = $dbr->select( 'revision', 'DISTINCT rev_user_text', array( 'rev_page' => $this->getArticleID(), - 'rev_id > ' . (int)$fromRevId, - 'rev_id < ' . (int)$toRevId + 'rev_timestamp > ' . $dbr->addQuotes( $dbr->timestamp( $old->getTimestamp() ) ), + 'rev_timestamp < ' . $dbr->addQuotes( $dbr->timestamp( $new->getTimestamp() ) ) ), __METHOD__, - array( 'LIMIT' => $limit ) + array( 'LIMIT' => $limit + 1 ) // add one so caller knows it was truncated ); - return (int)$db->numRows( $res ); + return (int)$dbr->numRows( $res ); } /** * Compare with another title. * * @param $title Title - * @return Bool TRUE or FALSE + * @return Bool */ public function equals( Title $title ) { // Note: === is necessary for proper matching of number-like titles. @@ -3725,9 +3860,24 @@ class Title { && $this->getDBkey() === $title->getDBkey(); } + /** + * Check if this title is a subpage of another title + * + * @param $title Title + * @return Bool + */ + public function isSubpageOf( Title $title ) { + return $this->getInterwiki() === $title->getInterwiki() + && $this->getNamespace() == $title->getNamespace() + && strpos( $this->getDBkey(), $title->getDBkey() . '/' ) === 0; + } + /** * Callback for usort() to do title sorts by (namespace, title) - * + * + * @param $a Title + * @param $b Title + * * @return Integer: result of string comparison, or namespace comparison */ public static function compare( $a, $b ) { @@ -3741,7 +3891,7 @@ class Title { /** * Return a string representation of this title * - * @return String String representation of this title + * @return String representation of this title */ public function __toString() { return $this->getPrefixedText(); @@ -3783,17 +3933,17 @@ class Title { switch( $this->mNamespace ) { case NS_MEDIA: case NS_FILE: - return (bool)wfFindFile( $this ); // file exists, possibly in a foreign repo + // file exists, possibly in a foreign repo + return (bool)wfFindFile( $this ); case NS_SPECIAL: - return SpecialPage::exists( $this->getDBkey() ); // valid special page + // valid special page + return SpecialPageFactory::exists( $this->getDBkey() ); case NS_MAIN: - return $this->mDbkeyform == ''; // selflink, possibly with fragment + // selflink, possibly with fragment + return $this->mDbkeyform == ''; case NS_MEDIAWIKI: - // If the page is form Mediawiki:message/lang, calling wfMsgWeirdKey causes - // the full l10n of that language to be loaded. That takes much memory and - // isn't needed. So we strip the language part away. - list( $basename, /* rest */ ) = explode( '/', $this->mDbkeyform, 2 ); - return (bool)wfMsgWeirdKey( $basename ); // known system message + // known system message + return $this->getDefaultMessageText() !== false; default: return false; } @@ -3824,16 +3974,34 @@ class Title { if ( $this->mNamespace == NS_MEDIAWIKI ) { // If the page doesn't exist but is a known system message, default // message content will be displayed, same for language subpages - // Also, if the page is form Mediawiki:message/lang, calling wfMsgWeirdKey - // causes the full l10n of that language to be loaded. That takes much - // memory and isn't needed. So we strip the language part away. - list( $basename, /* rest */ ) = explode( '/', $this->mDbkeyform, 2 ); - return (bool)wfMsgWeirdKey( $basename ); + return $this->getDefaultMessageText() !== false; } return false; } + /** + * Get the default message text or false if the message doesn't exist + * + * @return String or false + */ + public function getDefaultMessageText() { + global $wgContLang; + + if ( $this->getNamespace() != NS_MEDIAWIKI ) { // Just in case + return false; + } + + list( $name, $lang ) = MessageCache::singleton()->figureMessage( $wgContLang->lcfirst( $this->getText() ) ); + $message = wfMessage( $name )->inLanguage( $lang )->useDatabase( false ); + + if ( $message->exists() ) { + return $message->plain(); + } else { + return false; + } + } + /** * Is this in a namespace that allows actual pages? * @@ -3863,7 +4031,7 @@ class Title { * Get the last touched timestamp * * @param $db DatabaseBase: optional db - * @return String Last touched timestamp + * @return String last-touched timestamp */ public function getTouched( $db = null ) { $db = isset( $db ) ? $db : wfGetDB( DB_SLAVE ); @@ -3875,7 +4043,7 @@ class Title { * Get the timestamp when this page was updated since the user last saw it. * * @param $user User - * @return Mixed: string/null + * @return String|Null */ public function getNotificationTimestamp( $user = null ) { global $wgUser, $wgShowUpdatedMarker; @@ -3885,7 +4053,8 @@ class Title { } // Check cache first $uid = $user->getId(); - if ( isset( $this->mNotificationTimestamp[$uid] ) ) { + // avoid isset here, as it'll return false for null entries + if ( array_key_exists( $uid, $this->mNotificationTimestamp ) ) { return $this->mNotificationTimestamp[$uid]; } if ( !$uid || !$wgShowUpdatedMarker ) { @@ -3936,8 +4105,8 @@ class Title { // Spec: http://www.sixapart.com/pronet/docs/trackback_spec return "