From 08aa4418c30cfc18ccc69a0f0f9cb9e17be6c196 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Mon, 12 Aug 2013 09:28:15 +0200 Subject: Update to MediaWiki 1.21.1 --- includes/parser/LinkHolderArray.php | 96 ++++++++++++++++++++----------------- 1 file changed, 51 insertions(+), 45 deletions(-) (limited to 'includes/parser/LinkHolderArray.php') diff --git a/includes/parser/LinkHolderArray.php b/includes/parser/LinkHolderArray.php index d9356b48..49b2d333 100644 --- a/includes/parser/LinkHolderArray.php +++ b/includes/parser/LinkHolderArray.php @@ -43,9 +43,9 @@ class LinkHolderArray { } } - /** + /** * Don't serialize the parent object, it is big, and not needed when it is - * a parameter to mergeForeign(), which is the only application of + * a parameter to mergeForeign(), which is the only application of * serializing at present. * * Compact the titles, only serialize the text form. @@ -103,15 +103,15 @@ class LinkHolderArray { } /** - * Merge a LinkHolderArray from another parser instance into this one. The - * keys will not be preserved. Any text which went with the old - * LinkHolderArray and needs to work with the new one should be passed in + * Merge a LinkHolderArray from another parser instance into this one. The + * keys will not be preserved. Any text which went with the old + * LinkHolderArray and needs to work with the new one should be passed in * the $texts array. The strings in this array will have their link holders * converted for use in the destination link holder. The resulting array of * strings will be returned. * * @param $other LinkHolderArray - * @param $texts Array of strings + * @param array $texts of strings * @return Array */ function mergeForeign( $other, $texts ) { @@ -126,7 +126,7 @@ class LinkHolderArray { $maxId = $newKey > $maxId ? $newKey : $maxId; } } - $texts = preg_replace_callback( '/()/', + $texts = preg_replace_callback( '/()/', array( $this, 'mergeForeignCallback' ), $texts ); # Renumber interwiki links @@ -135,7 +135,7 @@ class LinkHolderArray { $this->interwikis[$newKey] = $entry; $maxId = $newKey > $maxId ? $newKey : $maxId; } - $texts = preg_replace_callback( '/()/', + $texts = preg_replace_callback( '/()/', array( $this, 'mergeForeignCallback' ), $texts ); # Set the parent link ID to be beyond the highest used ID @@ -159,8 +159,8 @@ class LinkHolderArray { # Internal links $pos = 0; while ( $pos < strlen( $text ) ) { - if ( !preg_match( '//', - $text, $m, PREG_OFFSET_CAPTURE, $pos ) ) + if ( !preg_match( '//', + $text, $m, PREG_OFFSET_CAPTURE, $pos ) ) { break; } @@ -210,14 +210,14 @@ class LinkHolderArray { * * @param $nt Title * @param $text String - * @param $query Array [optional] - * @param $trail String [optional] - * @param $prefix String [optional] + * @param array $query [optional] + * @param string $trail [optional] + * @param string $prefix [optional] * @return string */ - function makeHolder( $nt, $text = '', $query = array(), $trail = '', $prefix = '' ) { + function makeHolder( $nt, $text = '', $query = array(), $trail = '', $prefix = '' ) { wfProfileIn( __METHOD__ ); - if ( ! is_object($nt) ) { + if ( !is_object( $nt ) ) { # Fail gracefully $retVal = "{$prefix}{$text}{$trail}"; } else { @@ -226,7 +226,7 @@ class LinkHolderArray { $entry = array( 'title' => $nt, - 'text' => $prefix.$text.$inside, + 'text' => $prefix . $text . $inside, 'pdbk' => $nt->getPrefixedDBkey(), ); if ( $query !== array() ) { @@ -254,12 +254,12 @@ class LinkHolderArray { * @todo FIXME: Update documentation. makeLinkObj() is deprecated. * Replace link placeholders with actual links, in the buffer * Placeholders created in Skin::makeLinkObj() - * Returns an array of link CSS classes, indexed by PDBK. + * @return array of link CSS classes, indexed by PDBK. */ function replace( &$text ) { wfProfileIn( __METHOD__ ); - $colours = $this->replaceInternal( $text ); + $colours = $this->replaceInternal( $text ); // FIXME: replaceInternal doesn't return a value $this->replaceInterwiki( $text ); wfProfileOut( __METHOD__ ); @@ -281,7 +281,7 @@ class LinkHolderArray { $linkCache = LinkCache::singleton(); $output = $this->parent->getOutput(); - wfProfileIn( __METHOD__.'-check' ); + wfProfileIn( __METHOD__ . '-check' ); $dbr = wfGetDB( DB_SLAVE ); $threshold = $this->parent->getOptions()->getStubThreshold(); @@ -322,7 +322,7 @@ class LinkHolderArray { } if ( $queries ) { $where = array(); - foreach( $queries as $ns => $pages ){ + foreach( $queries as $ns => $pages ) { $where[] = $dbr->makeList( array( 'page_namespace' => $ns, @@ -355,19 +355,19 @@ class LinkHolderArray { } unset( $res ); } - if ( count($linkcolour_ids) ) { + if ( count( $linkcolour_ids ) ) { //pass an array of page_ids to an extension wfRunHooks( 'GetLinkColours', array( $linkcolour_ids, &$colours ) ); } - wfProfileOut( __METHOD__.'-check' ); + wfProfileOut( __METHOD__ . '-check' ); # Do a second query for different language variants of links and categories - if($wgContLang->hasVariants()) { + if( $wgContLang->hasVariants() ) { $this->doVariants( $colours ); } # Construct search and replace arrays - wfProfileIn( __METHOD__.'-construct' ); + wfProfileIn( __METHOD__ . '-construct' ); $replacePairs = array(); foreach ( $this->internals as $ns => $entries ) { foreach ( $entries as $index => $entry ) { @@ -399,16 +399,16 @@ class LinkHolderArray { } } $replacer = new HashtableReplacer( $replacePairs, 1 ); - wfProfileOut( __METHOD__.'-construct' ); + wfProfileOut( __METHOD__ . '-construct' ); # Do the thing - wfProfileIn( __METHOD__.'-replace' ); + wfProfileIn( __METHOD__ . '-replace' ); $text = preg_replace_callback( '/()/', $replacer->cb(), $text); - wfProfileOut( __METHOD__.'-replace' ); + wfProfileOut( __METHOD__ . '-replace' ); wfProfileOut( __METHOD__ ); } @@ -497,20 +497,23 @@ class LinkHolderArray { // process categories, check if a category exists in some variant $categoryMap = array(); // maps $category_variant => $category (dbkeys) $varCategories = array(); // category replacements oldDBkey => newDBkey - foreach( $output->getCategoryLinks() as $category ){ + foreach ( $output->getCategoryLinks() as $category ) { + $categoryTitle = Title::makeTitleSafe( NS_CATEGORY, $category ); + $linkBatch->addObj( $categoryTitle ); $variants = $wgContLang->autoConvertToAllVariants( $category ); - foreach($variants as $variant){ - if($variant != $category){ - $variantTitle = Title::newFromDBkey( Title::makeName(NS_CATEGORY,$variant) ); - if(is_null($variantTitle)) continue; + foreach ( $variants as $variant ) { + if ( $variant !== $category ) { + $variantTitle = Title::makeTitleSafe( NS_CATEGORY, $variant ); + if ( is_null( $variantTitle ) ) { + continue; + } $linkBatch->addObj( $variantTitle ); - $categoryMap[$variant] = $category; + $categoryMap[$variant] = array( $category, $categoryTitle ); } } } - - if(!$linkBatch->isEmpty()){ + if( !$linkBatch->isEmpty() ) { // construct query $dbr = wfGetDB( DB_SLAVE ); $varRes = $dbr->select( 'page', @@ -556,25 +559,28 @@ class LinkHolderArray { } // check if the object is a variant of a category - if(isset($categoryMap[$vardbk])){ - $oldkey = $categoryMap[$vardbk]; - if($oldkey != $vardbk) - $varCategories[$oldkey]=$vardbk; + if ( isset( $categoryMap[$vardbk] ) ) { + list( $oldkey, $oldtitle ) = $categoryMap[$vardbk]; + if ( !isset( $varCategories[$oldkey] ) && !$oldtitle->exists() ) { + $varCategories[$oldkey] = $vardbk; + } } } wfRunHooks( 'GetLinkColours', array( $linkcolour_ids, &$colours ) ); // rebuild the categories in original order (if there are replacements) - if(count($varCategories)>0){ + if( count( $varCategories ) > 0 ) { $newCats = array(); $originalCats = $output->getCategories(); - foreach($originalCats as $cat => $sortkey){ + foreach( $originalCats as $cat => $sortkey ) { // make the replacement - if( array_key_exists($cat,$varCategories) ) + if( array_key_exists( $cat, $varCategories ) ) { $newCats[$varCategories[$cat]] = $sortkey; - else $newCats[$cat] = $sortkey; + } else { + $newCats[$cat] = $sortkey; + } } - $output->setCategoryLinks($newCats); + $output->setCategoryLinks( $newCats ); } } } @@ -607,7 +613,7 @@ class LinkHolderArray { */ function replaceTextCallback( $matches ) { $type = $matches[1]; - $key = $matches[2]; + $key = $matches[2]; if( $type == 'LINK' ) { list( $ns, $index ) = explode( ':', $key, 2 ); if( isset( $this->internals[$ns][$index]['text'] ) ) { -- cgit v1.2.3-54-g00ecf