Merge remote branch 'origin/master'

libraries/common.lib.php

@@ -2563,7 +2563,7 @@ function PMA_generate_slider_effect($id, $message)
     //]]>
     </script>
     <noscript>
-    <div id="<?php echo $id; ?>">
+    <div id="<?php echo $id; ?>"></div>
     </noscript>
     <?php
 }

main.php

@@ -150,7 +150,7 @@ echo '</ul>';
 echo '<ul>';
 echo PMA_printListItem(__('More settings'), 'li_user_preferences',
                     './prefs_manage.php?' . $common_url_query);
-echo '<ul>';
+echo '</ul>';
 
 echo '</div>';