From 6ef1402e3db5ff8c0ad521264d7fee967236f779 Mon Sep 17 00:00:00 2001
From: Petr Skoda <skodak@moodle.org>
Date: Wed, 13 Oct 2010 17:35:21 +0000
Subject: [PATCH] MDL-24650 xhtml strict fix in forms

---
 lib/form/editor.php      | 2 +-
 lib/form/filemanager.php | 2 +-
 lib/form/filepicker.php  | 2 +-
 lib/form/submitlink.php  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/form/editor.php b/lib/form/editor.php
index 1ca0c371c83..4d97e251198 100644
--- a/lib/form/editor.php
+++ b/lib/form/editor.php
@@ -237,7 +237,7 @@ class MoodleQuickForm_editor extends HTML_QuickForm_element {
                     'sesskey'=>sesskey(),
                     ));
                 $str .= '<noscript>';
-                $str .= "<object type='text/html' data='$editorurl' height='160' width='600' style='border:1px solid #000'></object>";
+                $str .= "<div><object type='text/html' data='$editorurl' height='160' width='600' style='border:1px solid #000'></object></div>";
                 $str .= '</noscript>';
             }
         }
diff --git a/lib/form/filemanager.php b/lib/form/filemanager.php
index bd4e57d5f8f..e7c37de3631 100644
--- a/lib/form/filemanager.php
+++ b/lib/form/filemanager.php
@@ -331,7 +331,7 @@ FMHTML;
         ));
 
     $html .= '<noscript>';
-    $html .= "<object type='text/html' data='$filemanagerurl' height='160' width='600' style='border:1px solid #000'></object>";
+    $html .= "<div><object type='text/html' data='$filemanagerurl' height='160' width='600' style='border:1px solid #000'></object></div>";
     $html .= '</noscript>';
 
 
diff --git a/lib/form/filepicker.php b/lib/form/filepicker.php
index 5dc2b3159a0..2fa26738237 100644
--- a/lib/form/filepicker.php
+++ b/lib/form/filepicker.php
@@ -102,7 +102,7 @@ class MoodleQuickForm_filepicker extends HTML_QuickForm_input {
 
         // non js file picker
         $html .= '<noscript>';
-        $html .= "<object type='text/html' data='$nonjsfilepicker' height='160' width='600' style='border:1px solid #000'></object>";
+        $html .= "<div><object type='text/html' data='$nonjsfilepicker' height='160' width='600' style='border:1px solid #000'></object></div>";
         $html .= '</noscript>';
 
         return $html;
diff --git a/lib/form/submitlink.php b/lib/form/submitlink.php
index d9904c8f1ea..98286533c22 100644
--- a/lib/form/submitlink.php
+++ b/lib/form/submitlink.php
@@ -13,7 +13,7 @@ class MoodleQuickForm_submitlink extends MoodleQuickForm_submit {
         $onmouseover = "window.status=\'" . $text . "\';";
         $onmouseout = "window.status=\'\';";
 
-        return "<noscript>" . parent::toHtml() . '</noscript><script type="text/javascript">' . $this->_js . "\n"
+        return "<noscript><div>" . parent::toHtml() . '</div></noscript><script type="text/javascript">' . $this->_js . "\n"
              . 'document.write(\'<a href="#" onclick="' . $this->_onclick . '" onmouseover="' . $onmouseover . '" onmouseout="' . $onmouseout . '">'
              . $text . "</a>');\n</script>";
     }