Removed usage of extract() in LinkHolderArray::doVariants()
authorAlexandre Emsenhuber <ialex@users.mediawiki.org>
Wed, 16 Mar 2011 09:05:32 +0000 (09:05 +0000)
committerAlexandre Emsenhuber <ialex@users.mediawiki.org>
Wed, 16 Mar 2011 09:05:32 +0000 (09:05 +0000)
includes/parser/LinkHolderArray.php

index 25f5ab0..54bb41f 100644 (file)
@@ -461,14 +461,13 @@ class LinkHolderArray {
                for ( $i = 0; $i < $l; $i ++ ) {
                        foreach ( $allVariantsName as $variantName ) {
                                $textVariant = $titlesAllVariants[$variantName][$i];
-                               extract( $titlesAttrs[$i] );
-                               if($textVariant != $titleText){
-                                       $variantTitle = Title::makeTitle( $ns, $textVariant );
+                               if ( $textVariant != $titlesAttrs[$i]['titleText'] ) {
+                                       $variantTitle = Title::makeTitle( $titlesAttrs[$i]['ns'], $textVariant );
                                        if( is_null( $variantTitle ) ) {
                                                continue;
                                        }
                                        $linkBatch->addObj( $variantTitle );
-                                       $variantMap[$variantTitle->getPrefixedDBkey()][] = $key;
+                                       $variantMap[$variantTitle->getPrefixedDBkey()][] = $titlesAttrs[$i]['key'];
                                }
                        }
                }