Merge remote-tracking branch 'origin/master'

ChangeLog

@@ -10,6 +10,7 @@ phpMyAdmin - ChangeLog
 + rfe 1507  Part 1: Cycle through console history with keyboard up/down arrows
 
 4.3.3.0 (not yet released)
+- bug       The "Recently used tables" setting should be with Nav panel
 
 4.3.2.0 (2014-12-12)
 - bug #4628 PHP error while exporting schema as PDF

libraries/config/setup.forms.php

@@ -130,7 +130,6 @@ $forms['Features']['Other_core_settings'] = array(
     'InitialSlidersState',
     'MaxDbList',
     'MaxTableList',
-    'NumRecentTables',
     'NumFavoriteTables',
     'ShowHint',
     'OBGzip',
@@ -172,7 +171,8 @@ $forms['Navi_panel']['Navi_panel'] = array(
     'MaxNavigationItems',
     'NavigationTreeEnableGrouping',
     'NavigationTreeDisableDatabaseExpansion',
-    'NavigationTreeDisplayItemFilterMinimum');
+    'NavigationTreeDisplayItemFilterMinimum',
+    'NumRecentTables');
 $forms['Navi_panel']['Navi_servers'] = array(
     'NavigationDisplayServers',
     'DisplayServersList');

libraries/config/user_preferences.forms.php

@@ -32,7 +32,6 @@ $forms['Features']['General'] = array(
     'DisableMultiTableMaintenance',
     'MaxDbList',
     'MaxTableList',
-    'NumRecentTables',
     'NumFavoriteTables',
     'ShowHint',
     'SendErrorReports'
@@ -84,7 +83,8 @@ $forms['Navi_panel']['Navi_panel'] = array(
     'MaxNavigationItems',
     'NavigationTreeEnableGrouping',
     'NavigationTreeDisableDatabaseExpansion',
-    'NavigationTreeDisplayItemFilterMinimum');
+    'NavigationTreeDisplayItemFilterMinimum',
+    'NumRecentTables');
 $forms['Navi_panel']['Navi_databases'] = array(
     'NavigationTreeDisplayDbFilterMinimum',
     'NavigationTreeDbSeparator');