Merge "Make HTMLForm::formatErrors non-static to can parse message in context"

diff --combined includes/specials/SpecialBlock.php
index 195e64d,deb8b0d..1d4a860
--- 1/includes/specials/SpecialBlock.php
--- 2/includes/specials/SpecialBlock.php
+++ b/includes/specials/SpecialBlock.php
@@@ -105,7 -105,7 +105,7 @@@ class SpecialBlock extends FormSpecialP
  
                # Don't need to do anything if the form has been posted
                if ( !$this->getRequest()->wasPosted() && $this->preErrors ) {
-                       $s = HTMLForm::formatErrors( $this->preErrors );
+                       $s = $form->formatErrors( $this->preErrors );
                        if ( $s ) {
                                $form->addHeaderText( Html::rawElement(
                                        'div',
@@@ -829,7 -829,7 +829,7 @@@
                        }
  
                        list( $show, $value ) = explode( ':', $option );
 -                      $a[htmlspecialchars( $show )] = htmlspecialchars( $value );
 +                      $a[$show] = $value;
                }
  
                return $a;