return $this->mGoodTitles + $this->mMissingTitles;
}
- /**
- * Titles that were deemed invalid by Title::newFromText()
- * The array's index will be unique and negative for each item
- * @deprecated since 1.26, use self::getInvalidTitlesAndReasons()
- * @return string[] Array of strings (not Title objects)
- */
- public function getInvalidTitles() {
- wfDeprecated( __METHOD__, '1.26' );
- return array_map( function ( $t ) {
- return $t['title'];
- }, $this->mInvalidTitles );
- }
-
/**
* Titles that were deemed invalid by Title::newFromText()
* The array's index will be unique and negative for each item
/**
* Get a list of redirect resolutions - maps a title to its redirect
* target. Includes generator data for redirect source when available.
- * @param ApiResult $result
+ * @param ApiResult|null $result
* @return array Array of prefixed_title (string) => Title object
* @since 1.21
*/
/**
* Get a list of title normalizations - maps a title to its normalized
* version in the form of result array.
- * @param ApiResult $result
+ * @param ApiResult|null $result
* @return array Array of raw_prefixed_title (string) => prefixed_title (string)
* @since 1.21
*/
public function getNormalizedTitlesAsResult( $result = null ) {
- global $wgContLang;
-
$values = [];
+ $contLang = MediaWikiServices::getInstance()->getContentLanguage();
foreach ( $this->getNormalizedTitles() as $rawTitleStr => $titleStr ) {
- $encode = ( $wgContLang->normalize( $rawTitleStr ) !== $rawTitleStr );
+ $encode = $contLang->normalize( $rawTitleStr ) !== $rawTitleStr;
$values[] = [
'fromencoded' => $encode,
'from' => $encode ? rawurlencode( $rawTitleStr ) : $rawTitleStr,
/**
* Get a list of title conversions - maps a title to its converted
* version as a result array.
- * @param ApiResult $result
+ * @param ApiResult|null $result
* @return array Array of (from, to) strings
* @since 1.21
*/
/**
* Get a list of interwiki titles - maps a title to its interwiki
* prefix as result.
- * @param ApiResult $result
+ * @param ApiResult|null $result
* @param bool $iwUrl
* @return array Array of raw_prefixed_title (string) => interwiki_prefix (string)
* @since 1.21
/**
* Revision IDs that were not found in the database as result array.
- * @param ApiResult $result
+ * @param ApiResult|null $result
* @return array Array of revision IDs
* @since 1.21
*/
// Store Title object in various data structures
$title = Title::newFromRow( $row );
- LinkCache::singleton()->addGoodLinkObjFromRow( $title, $row );
+ $linkCache = MediaWikiServices::getInstance()->getLinkCache();
+ $linkCache->addGoodLinkObjFromRow( $title, $row );
$pageId = intval( $row->page_id );
$this->mAllPages[$row->page_namespace][$row->page_title] = $pageId;
/**
* Does the same as initFromTitles(), but is based on page IDs instead
* @param array $pageids Array of page IDs
+ * @param bool $filterIds Whether the IDs need filtering
*/
- private function initFromPageIds( $pageids ) {
+ private function initFromPageIds( $pageids, $filterIds = false ) {
if ( !$pageids ) {
return;
}
$pageids = array_map( 'intval', $pageids ); // paranoia
$remaining = array_flip( $pageids );
- $pageids = self::getPositiveIntegers( $pageids );
+ if ( $filterIds ) {
+ $pageids = $this->filterIDs( [ [ 'page', 'page_id' ] ], $pageids );
+ }
$res = null;
if ( !empty( $pageids ) ) {
// Any items left in the $remaining list are added as missing
if ( $processTitles ) {
// The remaining titles in $remaining are non-existent pages
- $linkCache = LinkCache::singleton();
+ $linkCache = MediaWikiServices::getInstance()->getLinkCache();
foreach ( $remaining as $ns => $dbkeys ) {
foreach ( array_keys( $dbkeys ) as $dbkey ) {
$title = Title::makeTitle( $ns, $dbkey );
$pageids = [];
$remaining = array_flip( $revids );
- $revids = self::getPositiveIntegers( $revids );
+ $revids = $this->filterIDs( [ [ 'revision', 'rev_id' ], [ 'archive', 'ar_rev_id' ] ], $revids );
+ $goodRemaining = array_flip( $revids );
- if ( !empty( $revids ) ) {
+ if ( $revids ) {
$tables = [ 'revision', 'page' ];
$fields = [ 'rev_id', 'rev_page' ];
$where = [ 'rev_id' => $revids, 'rev_page = page_id' ];
$this->mLiveRevIDs[$revid] = $pageid;
$pageids[$pageid] = '';
unset( $remaining[$revid] );
+ unset( $goodRemaining[$revid] );
}
}
- $this->mMissingRevIDs = array_keys( $remaining );
-
// Populate all the page information
- $this->initFromPageIds( array_keys( $pageids ) );
+ $this->initFromPageIds( array_keys( $pageids ), false );
// If the user can see deleted revisions, pull out the corresponding
// titles from the archive table and include them too. We ignore
// ar_page_id because deleted revisions are tied by title, not page_id.
- if ( !empty( $this->mMissingRevIDs ) && $this->getUser()->isAllowed( 'deletedhistory' ) ) {
- $remaining = array_flip( $this->mMissingRevIDs );
+ if ( $goodRemaining && $this->getUser()->isAllowed( 'deletedhistory' ) ) {
$tables = [ 'archive' ];
$fields = [ 'ar_rev_id', 'ar_namespace', 'ar_title' ];
- $where = [ 'ar_rev_id' => $this->mMissingRevIDs ];
+ $where = [ 'ar_rev_id' => array_keys( $goodRemaining ) ];
$res = $db->select( $tables, $fields, $where, __METHOD__ );
$titles = [];
$remaining[$revid] = true;
}
}
-
- $this->mMissingRevIDs = array_keys( $remaining );
}
+
+ $this->mMissingRevIDs = array_keys( $remaining );
}
/**
private function processTitlesArray( $titles ) {
$usernames = [];
$linkBatch = new LinkBatch();
+ $services = MediaWikiServices::getInstance();
+ $contLang = $services->getContentLanguage();
foreach ( $titles as $title ) {
if ( is_string( $title ) ) {
$this->mInterwikiTitles[$unconvertedTitle] = $titleObj->getInterwiki();
} else {
// Variants checking
- global $wgContLang;
- if ( $this->mConvertTitles &&
- count( $wgContLang->getVariants() ) > 1 &&
- !$titleObj->exists()
+ if (
+ $this->mConvertTitles && $contLang->hasVariants() && !$titleObj->exists()
) {
// Language::findVariantLink will modify titleText and titleObj into
// the canonical variant if possible
$titleText = is_string( $title ) ? $title : $titleObj->getPrefixedText();
- $wgContLang->findVariantLink( $titleText, $titleObj );
+ $contLang->findVariantLink( $titleText, $titleObj );
$titleWasConverted = $unconvertedTitle !== $titleObj->getPrefixedText();
}
$this->mAllSpecials[$ns][$dbkey] = $this->mFakePageId;
$target = null;
if ( $ns === NS_SPECIAL && $this->mResolveRedirects ) {
- $special = SpecialPageFactory::getPage( $dbkey );
+ $spFactory = $services->getSpecialPageFactory();
+ $special = $spFactory->getPage( $dbkey );
if ( $special instanceof RedirectSpecialArticle ) {
// Only RedirectSpecialArticle is intended to redirect to an article, other kinds of
// RedirectSpecialPage are probably applying weird URL parameters we don't want to handle.
$context->setTitle( $titleObj );
$context->setRequest( new FauxRequest );
$special->setContext( $context );
- list( /* $alias */, $subpage ) = SpecialPageFactory::resolveAlias( $dbkey );
+ list( /* $alias */, $subpage ) = $spFactory->resolveAlias( $dbkey );
$target = $special->getRedirect( $subpage );
}
}
}
}
// Get gender information
- $genderCache = MediaWikiServices::getInstance()->getGenderCache();
+ $genderCache = $services->getGenderCache();
$genderCache->doQuery( $usernames, __METHOD__ );
return $linkBatch;
if ( isset( $data[$toPageId] ) &&
isset( $this->mGeneratorData[$fromNs][$fromDBkey] )
) {
- // It is necesary to set both $data and add to $result, if an ApiResult,
+ // It is necessary to set both $data and add to $result, if an ApiResult,
// to ensure multiple redirects to the same destination are all merged.
$data[$toPageId] = call_user_func(
$this->mRedirectMergePolicy,
return $this->mDbSource->getDB();
}
- /**
- * Returns the input array of integers with all values < 0 removed
- *
- * @param array $array
- * @return array
- */
- private static function getPositiveIntegers( $array ) {
- // T27734 API: possible issue with revids validation
- // It seems with a load of revision rows, MySQL gets upset
- // Remove any < 0 integers, as they can't be valid
- foreach ( $array as $i => $int ) {
- if ( $int < 0 ) {
- unset( $array[$i] );
- }
- }
-
- return $array;
- }
-
public function getAllowedParams( $flags = 0 ) {
$result = [
'titles' => [
dépôts / lhc / web / wiklou.git / blobdiff