Merged from 1.7

diff --git a/lib/weblib.php b/lib/weblib.php
index bb938d80d2a47a9bb4789d493bfb502126d0c92a..90f022db153f6a11bd347ac49f595c93455030a5 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -1052,8 +1052,8 @@ function popup_form($common, $options, $formname, $selected='', $nothing='choose
 
     $output .= '</select>';
     $output .= '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
-    $output .= '<noscript id="noscript'.$formname.'" style="display: inline;">';
-    $output .= '<input type="submit" value="'.$go.'" /></noscript>';
+    $output .= '<div id="noscript'.$formname.'" style="display: inline;">';
+    $output .= '<input type="submit" value="'.$go.'" /></div>';
     $output .= '<script type="text/javascript">'.
                "\n<!--\n".
                'document.getElementById("noscript'.$formname.'").style.display = "none";'.