Merge "In LinkHolderArray::doVariants(), redlinks need to be checked as well."

diff --combined includes/parser/LinkHolderArray.php
index 02950f0,02077f9..d9356b4
--- 1/includes/parser/LinkHolderArray.php
--- 2/includes/parser/LinkHolderArray.php
+++ b/includes/parser/LinkHolderArray.php
@@@ -209,10 -209,6 +209,10 @@@ class LinkHolderArray 
         * article length checks (for stub links) to be bundled into a single query.
         *
         * @param $nt Title
 +       * @param $text String
 +       * @param $query Array [optional]
 +       * @param $trail String [optional]
 +       * @param $prefix String [optional]
         * @return string
         */
        function makeHolder( $nt, $text = '', $query = array(), $trail = '', $prefix = ''  ) {
@@@ -457,7 -453,7 +457,7 @@@
                        foreach ( $entries as $index => $entry ) {
                                $pdbk = $entry['pdbk'];
                                // we only deal with new links (in its first query)
-                               if ( !isset( $colours[$pdbk] ) ) {
+                               if ( !isset( $colours[$pdbk] ) || $colours[$pdbk] === 'new' ) {
                                        $title = $entry['title'];
                                        $titleText = $title->getText();
                                        $titlesAttrs[] = array(
@@@ -473,7 -469,7 +473,7 @@@
                }
  
                // Now do the conversion and explode string to text of titles
-               $titlesAllVariants = $wgContLang->autoConvertToAllVariants( $titlesToBeConverted );
+               $titlesAllVariants = $wgContLang->autoConvertToAllVariants( rtrim( $titlesToBeConverted, "\0" ) );
                $allVariantsName = array_keys( $titlesAllVariants );
                foreach ( $titlesAllVariants as &$titlesVariant ) {
                        $titlesVariant = explode( "\0", $titlesVariant );
@@@ -541,7 -537,7 +541,7 @@@
                                        $entry =& $this->internals[$ns][$index];
                                        $pdbk = $entry['pdbk'];
  
-                                       if(!isset($colours[$pdbk])){
+                                       if ( !isset( $colours[$pdbk] ) || $colours[$pdbk] === 'new' ) {
                                                // found link in some of the variants, replace the link holder data
                                                $entry['title'] = $variantTitle;
                                                $entry['pdbk'] = $varPdbk;