Merge branch 'QA_4_6'

2016-04-06 14:06:37 +02:00 · 2016-04-06 14:06:37 +02:00 · 6d480f6791
commit 6d480f6791
parent 2c1b18a75b 7de636d826
2 changed files with 2 additions and 1 deletions
--- a/1
+++ b/1
@ -20,6 +20,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
--- 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
            )