diff options
Diffstat (limited to 'core/Plugin.php')
-rw-r--r-- | core/Plugin.php | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/core/Plugin.php b/core/Plugin.php index fcfdc612a7..c0ac9ecb0a 100644 --- a/core/Plugin.php +++ b/core/Plugin.php @@ -355,9 +355,9 @@ class Plugin $cacheId = 'Plugin' . $this->pluginName . $componentName . $expectedSubclass; - $pluginsDir = Manager::getPluginsDirectory(); + $pluginsDir = Manager::getPluginDirectory($this->pluginName); - $componentFile = sprintf('%s%s/%s.php', $pluginsDir, $this->pluginName, $componentName); + $componentFile = sprintf('%s/%s.php', $pluginsDir, $componentName); if ($this->cache->contains($cacheId)) { $classname = $this->cache->fetch($cacheId); @@ -537,8 +537,9 @@ class Plugin { $components = array(); - $pluginsDir = Manager::getPluginsDirectory(); - $baseDir = $pluginsDir . $this->pluginName . '/' . $directoryWithinPlugin; + $pluginsDir = Manager::getPluginDirectory($this->pluginName); + $baseDir = $pluginsDir . '/' . $directoryWithinPlugin; + $files = Filesystem::globr($baseDir, '*.php'); foreach ($files as $file) { |