From b55719206b702438e0e57d71c5cf5e974188a959 Mon Sep 17 00:00:00 2001 From: Hugues Peccatte Date: Mon, 9 Jun 2014 15:24:07 +0200 Subject: [PATCH 1/2] Remove SQL format for multi-table queries. Signed-off-by: Hugues Peccatte --- libraries/plugin_interface.lib.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libraries/plugin_interface.lib.php b/libraries/plugin_interface.lib.php index 925a890db6..25698e2174 100644 --- a/libraries/plugin_interface.lib.php +++ b/libraries/plugin_interface.lib.php @@ -75,7 +75,10 @@ function PMA_getPlugins($plugin_type, $plugins_dir, $plugin_param) include_once $plugins_dir . $file; if (! $GLOBALS['skip_import']) { $class_name = $class_type . $matches[1]; - $plugin_list [] = new $class_name; + $plugin = new $class_name; + if (null !== $plugin->getProperties()) { + $plugin_list[] = $plugin; + } } } } From 4a10628d8179a18f09b0ba4c489c946c77e83981 Mon Sep 17 00:00:00 2001 From: Hugues Peccatte Date: Mon, 9 Jun 2014 15:32:32 +0200 Subject: [PATCH 2/2] Update ChangeLog. Signed-off-by: Hugues Peccatte --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 2440c21aa4..67183f00d8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog ====================== 4.2.4.0 (not yet released) +- #4445 Fatal error on SQL Export of join query 4.2.3.0 (2014-06-08) - bug #4423 Moving fields not working