Plugin: Load the plugin.php file in the right scope to get $plugin_info

Author: AngelFQC

public/main/inc/lib/plugin.class.php

@@ -110,7 +110,7 @@ public function get_info()
         $result['is_course_plugin'] = $this->isCoursePlugin;
         $result['is_admin_plugin'] = $this->isAdminPlugin;
         $result['is_mail_plugin'] = $this->isMailPlugin;
-        $result['entity'] = $pluginRepo->findOneByTitle($this->get_title());
+        $result['entity'] = $pluginRepo->findOneByTitle($this->get_name());
 
         if ($form = $this->getSettingsForm()) {
             $result['settings_form'] = $form;

public/main/inc/lib/plugin.lib.php

@@ -453,22 +453,27 @@ public function getPluginInfo($pluginName, $forced = false)
         $plugin_info = [];
         $pluginPath  = api_get_path(SYS_PLUGIN_PATH);
 
-        $pluginDir = null;
         $posibleName = [
             $pluginName,
             strtolower($pluginName),
             ucfirst(strtolower($pluginName)),
         ];
+
+        $plugin_file = null;
+
         foreach ($posibleName as $dir) {
             $path = $pluginPath."$dir/plugin.php";
             if (is_file($path)) {
-                $fileToLoad = true;
-                include_once $path;
-                $pluginDir = $dir;
+                $plugin_file = $path;
                 break;
             }
         }
 
+        if ($plugin_file) {
+            $fileToLoad = true;
+            require $plugin_file;
+        }
+
         if (isset($plugin_info['plugin_class']) && class_exists($plugin_info['plugin_class'], false)) {
             $cls = $plugin_info['plugin_class'];
             $instance = method_exists($cls, 'create') ? $cls::create() : new $cls();