Merge commit 'upstream/master'

Conflicts:

	modules/gallery/tests/xss_data.txt

1 files changed, 2 insertions, 2 deletions

diff --git a/modules/gallery/views/form.html.php b/modules/gallery/views/form.html.php
index 730d77cb..abc32164 100644
--- a/modules/gallery/views/form.html.php
+++ b/modules/gallery/views/form.html.php
@@ -44,7 +44,7 @@ if (!function_exists("DrawForm")) {
         print $input->render();
       } else {
         if ($input->error_messages()) {
-          print "$prefix<li class=\"gError\">\n";
+          print "$prefix<li class=\"g-error\">\n";
         } else {
           print "$prefix<li>\n";
         }
@@ -58,7 +58,7 @@ if (!function_exists("DrawForm")) {
         }
         if ($input->error_messages()) {
           foreach ($input->error_messages() as $error_message) {
-            print "$prefix  <p class=\"gError\">\n";
+            print "$prefix  <p class=\"g-message g-error\">\n";
             print "$prefix    $error_message\n";
             print "$prefix  </p>\n";
           }