Merge "Revert "TableSorter: Avoid FOUC and preserve styling in VisualEditor""

[lhc/web/wiklou.git] / includes / parser / CoreTagHooks.php

diff --git a/includes/parser/CoreTagHooks.php b/includes/parser/CoreTagHooks.php
index 3ffa16c..9755ea9 100644 (file)
--- a/includes/parser/CoreTagHooks.php
+++ b/includes/parser/CoreTagHooks.php
@@ -135,13 +135,13 @@ class CoreTagHooks {
        public static function indicator( $content, array $attributes, Parser $parser, PPFrame $frame ) {
                if ( !isset( $attributes['name'] ) || trim( $attributes['name'] ) === '' ) {
                        return '<span class="error">' .
-                               wfMessage( 'invalid-indicator-name' )->inContentLanguage()->text() .
+                               wfMessage( 'invalid-indicator-name' )->inContentLanguage()->parse() .
                                '</span>';
                }
 
                $parser->getOutput()->setIndicator(
                        trim( $attributes['name'] ),
-                       $parser->recursiveTagParse( $content, $frame )
+                       Parser::stripOuterParagraph( $parser->recursiveTagParseFully( $content, $frame ) )
                );
 
                return '';