Merge "Fixup contenttype stuff in UserMailer"

diff --cc includes/mail/UserMailer.php
index 5343b2c,ded5dec..464e7b8
--- 1/includes/mail/UserMailer.php
--- 2/includes/mail/UserMailer.php
+++ b/includes/mail/UserMailer.php
@@@ -114,9 -114,9 +114,9 @@@ class UserMailer 
         * @throws Exception
         * @return Status
         */
 -      public static function send( $to, $from, $subject, $body, $options = array() ) {
 +      public static function send( $to, $from, $subject, $body, $options = [] ) {
                global $wgAllowHTMLEmail;
-               $contentType = 'text/plain; charset=UTF-8';
+ 
                if ( !is_array( $options ) ) {
                        // Old calling style
                        wfDeprecated( __METHOD__ . ' with $replyto as 5th parameter', '1.26' );
@@@ -125,9 -125,12 +125,12 @@@
                                $options['contentType'] = func_get_arg( 5 );
                        }
                }
+               if ( !isset( $options['contentType'] ) ) {
+                       $options['contentType'] = 'text/plain; charset=UTF-8';
+               }
  
                if ( !is_array( $to ) ) {
 -                      $to = array( $to );
 +                      $to = [ $to ];
                }
  
                // mail body must have some content