From 7de636d8260da7552d6b1609cfa15711589a148b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 6 Apr 2016 14:05:49 +0200 Subject: [PATCH] Fix PHP error if user did unpack new version over old one MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit By doing stricter check on filename, we avoid old classes which break autoloader. Fixes #12159 Signed-off-by: Michal Čihař --- ChangeLog | 1 + libraries/plugin_interface.lib.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b59e582d9c..860aa5ded2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ phpMyAdmin - ChangeLog - issue #12154 Fixed possible PHP error in SQL parser - issue #12029 Fixed SQL quoting in SQL export - issue #12129 Improve performance of database structure page +- issue #12159 Fix PHP error if user did unpack new version over old one 4.6.0.0 (2016-03-22) + issue #11456 Disabled storage engines diff --git a/libraries/plugin_interface.lib.php b/libraries/plugin_interface.lib.php index c8df3875af..1d165a1bf3 100644 --- a/libraries/plugin_interface.lib.php +++ b/libraries/plugin_interface.lib.php @@ -76,7 +76,7 @@ function PMA_getPlugins($plugin_type, $plugins_dir, $plugin_param) // with ".php" if (is_file($plugins_dir . $file) && preg_match( - '@^' . $class_type . '(.+)\.php$@i', + '@^' . $class_type . '([^\.]+)\.php$@i', $file, $matches )