From faffa92f2246709d1c514b4d522ba8de449774d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 1 Mar 2017 15:43:17 +0100 Subject: [PATCH] Fixed related field selection for native relations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The PMA_getForeigners handles just fine both situations, so there is no need to check the configuration in advance. Fixes #12967 Signed-off-by: Michal Čihař --- ChangeLog | 1 + browse_foreigners.php | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 91a382df43..6de1b950aa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -90,6 +90,7 @@ phpMyAdmin - ChangeLog - issue Fixed javascript confirmation of dangerous queries - issue #13040 Compatibility with hhvm 3.18 - issue #13031 Fixed displaying of all rows +- issue #12967 Fixed related field selection for native relations 4.6.6 (2017-01-23) - issue #12759 Fix Notice regarding 'Undefined index: old_usergroup' diff --git a/browse_foreigners.php b/browse_foreigners.php index 8bfd85d6f1..ac28f30423 100644 --- a/browse_foreigners.php +++ b/browse_foreigners.php @@ -37,8 +37,7 @@ $header->setBodyId('body_browse_foreigners'); * Displays the frame */ -$cfgRelation = PMA_getRelationsParam(); -$foreigners = ($cfgRelation['relwork'] ? PMA_getForeigners($db, $table) : false); +$foreigners = PMA_getForeigners($db, $table); $foreign_limit = PMA_getForeignLimit( isset($_REQUEST['foreign_showAll']) ? $_REQUEST['foreign_showAll'] : null );