Fix case issue.

Use FQN to load class. Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
phpmyadmin · Sep 12, 2015 · 27e362b · 27e362b
1 parent 0233cc5
commit 27e362b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/libraries/display_import_ajax.lib.php b/libraries/display_import_ajax.lib.php
@@ -45,7 +45,6 @@
     if ($check()) {
         $upload_class = 'PMA\libraries\plugins\import\upload\Upload' . ucwords($plugin);
         $_SESSION[$SESSION_KEY]["handler"] = $upload_class;
-        include_once "plugins/import/upload/" . $upload_class . ".php";
         break;
     }
 }

diff --git a/libraries/plugin_interface.lib.php b/libraries/plugin_interface.lib.php
@@ -36,7 +36,8 @@ function PMA_getPlugin(
     $file = $class_name . ".php";
     if (is_file($plugins_dir . $file)) {
         //include_once $plugins_dir . $file;
-        return new $class_name;
+        $fqnClass = 'PMA\\' . str_replace('/', '\\', $plugins_dir) . $class_name;
+        return new $fqnClass;
     }
 
     return null;

diff --git a/tbl_structure.php b/tbl_structure.php
@@ -21,9 +21,9 @@
 require_once 'libraries/config/page_settings.forms.php';
 
 $container = libraries\di\Container::getDefaultContainer();
-$container->factory('PMA\libraries\controllers\tableStructureController');
+$container->factory('PMA\libraries\controllers\TableStructureController');
 $container->alias(
-    'TableStructureController', 'PMA\libraries\controllers\tableStructureController'
+    'TableStructureController', 'PMA\libraries\controllers\TableStructureController'
 );
 $container->set('PMA\libraries\Response', Response::getInstance());
 $container->alias('response', 'PMA\libraries\Response');