Merge remote branch 'origin/master'

2010-10-09 14:40:09 +02:00 · 2010-10-09 14:40:09 +02:00 · 85b8fb00cf
commit 85b8fb00cf
parent 4f6291abba 452dce72a2
2 changed files with 2 additions and 2 deletions
--- a/libraries/common.lib.php
+++ b/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
 }
--- a/main.php
+++ b/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>';