* API: (bug 20700) Add amprop=default to list default messages in list=allmessages...

[lhc/web/wiklou.git] / includes / ChangeTags.php

diff --git a/includes/ChangeTags.php b/includes/ChangeTags.php
index 23329c4..3b72bd1 100644 (file)
--- a/includes/ChangeTags.php
+++ b/includes/ChangeTags.php
@@ -14,7 +14,8 @@ class ChangeTags {
                $displayTags = array();
                foreach( $tags as $tag ) {
                        $displayTags[] = Xml::tags( 'span',
-                                                               array( 'class' => "mw-tag-marker mw-tag-marker-$tag" ),
+                                                               array( 'class' => "mw-tag-marker ".
+                                                                                       Sanitizer::escapeClass("mw-tag-marker-$tag") ),
                                                                self::tagDescription( $tag ) );
                        $classes[] = Sanitizer::escapeClass( "mw-tag-$tag" );
                }
@@ -124,7 +125,9 @@ class ChangeTags {
                        // Add an INNER JOIN on change_tag
 
                        // FORCE INDEX -- change_tags will almost ALWAYS be the correct query plan.
-                       $options['USE INDEX'] = array( 'change_tag' => 'change_tag_tag_id' );
+                       global $wgOldChangeTagsIndex;
+                       $index = $wgOldChangeTagsIndex ? 'ct_tag' : 'change_tag_tag_id';
+                       $options['USE INDEX'] = array( 'change_tag' => $index );
                        unset( $options['FORCE INDEX'] );
                        $tables[] = 'change_tag';
                        $join_conds['change_tag'] = array( 'INNER JOIN', "ct_$join_cond=$join_cond" );