From 822c4dfec2b59e77922cec6059b2831d803f0606 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Thu, 7 May 2015 14:19:42 -0400
Subject: [PATCH] bug #4876 Settings issues (Favorite tables shown twice in
 Settings)

Signed-off-by: Marc Delisle <marc@infomarc.info>
---
 ChangeLog                                   | 1 +
 libraries/config/user_preferences.forms.php | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 3055e5bde3..d0df676b0b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog
 ======================
 
 4.4.7.0 (not yet released)
+- bug #4876 Settings issues (Favorite tables shown twice in Settings)
 
 4.4.6.0 (2015-05-07)
 - bug #4890 webkitStorageInfo and webkitIndexedDB is deprecated
diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php
index 150642e93f..31fdf15953 100644
--- a/libraries/config/user_preferences.forms.php
+++ b/libraries/config/user_preferences.forms.php
@@ -32,7 +32,6 @@ $forms['Features']['General'] = array(
     'DisableMultiTableMaintenance',
     'MaxDbList',
     'MaxTableList',
-    'NumFavoriteTables',
     'ShowHint',
     'SendErrorReports'
 );