Merge "Adjusting places where form error message's container appears escaped"

htdocs/blocktype/externalfeed/lib.php

@@ -211,7 +211,7 @@ class PluginBlocktypeExternalfeed extends SystemBlocktype {
         else {
             $proto = substr($values['url'], 0, strpos($values['url'], '://'));
             if (!in_array($proto, array('http', 'https'))) {
-                $form->set_error('url', get_string('invalidurl', 'blocktype.externalfeed'));
+                $form->set_error('url', get_string('invalidurl', 'blocktype.externalfeed'), false);
             }
         }
 
@@ -223,7 +223,7 @@ class PluginBlocktypeExternalfeed extends SystemBlocktype {
                 $olddata = $instance->get_data('feed', $configdata['feedid']);
                 if ($olddata) {
                     if ($values['url'] <> $olddata->url && $olddata->authpassword != '' && $values['authpassword']['submittedvalue'] === null) {
-                        $form->set_error('authpassword', get_string('reenterpassword', 'blocktype.externalfeed'));
+                        $form->set_error('authpassword', get_string('reenterpassword', 'blocktype.externalfeed'), false);
                         return;
                     }
                 }
@@ -237,7 +237,7 @@ class PluginBlocktypeExternalfeed extends SystemBlocktype {
                 return;
             }
             catch (XML_Feed_Parser_Exception $e) {
-                $form->set_error('url', get_string('invalidfeed', 'blocktype.externalfeed',  $e->getMessage()));
+                $form->set_error('url', get_string('invalidfeed', 'blocktype.externalfeed',  hsc($e->getMessage())), false);
             }
         }
     }

htdocs/blocktype/externalvideo/lib.php

@@ -230,7 +230,7 @@ class PluginBlocktypeExternalvideo extends SystemBlocktype {
         }
 
         // Nothing recognised this url.
-        $form->set_error('videoid', get_string('invalidurl', 'blocktype.externalvideo'));
+        $form->set_error('videoid', get_string('invalidurl', 'blocktype.externalvideo'), false);
     }
 
     public static function instance_config_save($values) {