Merge "Perform a permission check on the title when changing the page language"

[lhc/web/wiklou.git] / includes / parser / CoreTagHooks.php
diff --git a/includes/parser/CoreTagHooks.php b/includes/parser/CoreTagHooks.php

index c943b7c..438603a 100644 (file)
--- a/includes/parser/CoreTagHooks.php
+++ b/includes/parser/CoreTagHooks.php
@@ -79,12 +79,25 @@ class CoreTagHooks {
          * @param array $attributes
          * @param Parser $parser
          * @throws MWException
-        * @return array
+        * @return array|string Output of tag hook
          */
         public static function html( $content, $attributes, $parser ) {
                 global $wgRawHtml;
                 if ( $wgRawHtml ) {
-                       return [ $content, 'markerType' => 'nowiki' ];
+                       if ( $parser->getOptions()->getAllowUnsafeRawHtml() ) {
+                               return [ $content, 'markerType' => 'nowiki' ];
+                       } else {
+                               // In a system message where raw html is
+                               // not allowed (but it is allowed in other
+                               // contexts).
+                               return Html::rawElement(
+                                       'span',
+                                       [ 'class' => 'error' ],
+                                       // Using ->text() not ->parse() as
+                                       // a paranoia measure against a loop.
+                                       wfMessage( 'rawhtml-notallowed' )->escaped()
+                               );
+                       }
                 } else {
                         throw new MWException( '<html> extension tag encountered unexpectedly' );
                 }