MDL-19030 fixed xhtml strictness when label attached to frozen element; merged from...

diff --git a/lib/pear/HTML/QuickForm/Renderer/Tableless.php b/lib/pear/HTML/QuickForm/Renderer/Tableless.php
index fb5196ffec6c2d976c7b111520fc88474f42857d..8f653c711a1736b18e937bb6ee2eaeadcbe782e3 100644 (file)
--- a/lib/pear/HTML/QuickForm/Renderer/Tableless.php
+++ b/lib/pear/HTML/QuickForm/Renderer/Tableless.php
@@ -186,7 +186,7 @@ class HTML_QuickForm_Renderer_Tableless extends HTML_QuickForm_Renderer_Default
             } else {
                 $id = $element->getName();
             }
-            if (!empty($id)) {
+            if (!empty($id) and !$element->isFrozen()) { // moodle hack
                 $html = str_replace('<label', '<label for="' . $id . '"', $html);
                 $element_html = preg_replace('#name="' . $id . '#',
                                              'id="' . $id . '" name="' . $id . '',