Merged branch official/master. Resolved merge conflicts introduced due to merging of Piotr and Martynas's branches

2010-08-28 01:53:52 +05:30
parent cce1ef0eda ac5cab4f6f
commit 9c34a0eec9
172 changed files with 233085 additions and 159854 deletions
--- a/main.php
+++ b/main.php
@@ -144,6 +144,14 @@ echo PMA_Config::getFontsizeForm();
 echo '</li>';

 echo '</ul>';
+
+// User preferences
+
+echo '<ul>';
+echo PMA_printListItem(__('More settings'), 'li_user_preferences',
+                    './prefs_manage.php?' . $common_url_query);
+echo '<ul>';
+
 echo '</div>';