Merge branch 'b4445_42' of git://github.com/Tithugues/phpmyadmin into QA_4_2

Conflicts:
	ChangeLog

ChangeLog

@@ -4,6 +4,7 @@ phpMyAdmin - ChangeLog
 4.2.4.0 (not yet released)
 - bug #4449 Mediawiki export does not produce table header row; also fix related PHP warnings
 - bug #4442 New lines are added to query every time
+- bug #4445 Fatal error on SQL Export of join query
 
 4.2.3.0 (2014-06-08)
 - bug #4423 Moving fields not working

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;
+                }
             }
         }
     }