Merge "Block: Explicit convert Message to string"

diff --combined includes/Block.php
index 6abc83a,8eac6b6..65408f6
--- 1/includes/Block.php
--- 2/includes/Block.php
+++ b/includes/Block.php
@@@ -121,9 -121,6 +121,9 @@@ class Block 
         *                          created by MediaWiki rather than being stored
         *                          in the database. Value is a string to return
         *                          from self::getSystemBlockType().
 +       *     sitewide bool        Disallow editing all pages and all contribution
 +       *                          actions, except those specifically allowed by
 +       *                          other block flags
         *
         * @since 1.26 accepts $options array instead of individual parameters; order
         * of parameters above reflects the original order
@@@ -1294,10 -1291,10 +1294,10 @@@
         */
        public function getRedactedName() {
                if ( $this->mAuto ) {
-                       return Html::rawElement(
+                       return Html::element(
                                'span',
                                [ 'class' => 'mw-autoblockid' ],
-                               wfMessage( 'autoblockid', $this->mId )
+                               wfMessage( 'autoblockid', $this->mId )->text()
                        );
                } else {
                        return htmlspecialchars( $this->getTarget() );