diff options
| author | Thomas Steur <tsteur@users.noreply.github.com> | 2019-03-15 01:24:36 +0300 |
|---|---|---|
| committer | diosmosis <diosmosis@users.noreply.github.com> | 2019-03-15 01:24:36 +0300 |
| commit | 6395855aa7f3813cc7f413a18d31505ea26ba32a (patch) | |
| tree | 2a3157954dd3c29cc024bf7093df53b63be94dd6 /core/Container | |
| parent | d7c932710e690d87ea62c3ec94ae65fa5bd05b05 (diff) | |
Support multiple plugin paths (#14051)
* do not hard code plugins directory
* remove method that is not needed for now
* use plugins directory in more places
* some work on supporting multiple plugin directories
* use more unique name
* couple fixes
* and another fix
* sort plugins
* adjust languagesmanager
* adjust more usages
* Update Manager.php
* adding a plugin to test
* more tests
* make sure plugin resources can be located in custom directory
* adding more tests
* rewrite image paths
* handle more cases
* add tests
* make sure to load plugin
* trying to fix test
* trying it this way
* load plugin
* fix ui test?
* testing if tests succeed this way
* another test
* load custom dir plugin
* load plugin in ui fixture
* change the update statement
* remove update script
* delete column
* fix ui test
* make it work for tests
* fix some tests
* Fix merge.
Diffstat (limited to 'core/Container')
| -rw-r--r-- | core/Container/ContainerFactory.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/Container/ContainerFactory.php b/core/Container/ContainerFactory.php index e1696db194..39d398782d 100644 --- a/core/Container/ContainerFactory.php +++ b/core/Container/ContainerFactory.php @@ -121,7 +121,7 @@ class ContainerFactory // add plugin environment configs $plugins = $this->pluginList->getActivatedPlugins(); foreach ($plugins as $plugin) { - $baseDir = Manager::getPluginsDirectory() . $plugin; + $baseDir = Manager::getPluginDirectory($plugin); $environmentFile = $baseDir . '/config/' . $environment . '.php'; if (file_exists($environmentFile)) { @@ -135,7 +135,7 @@ class ContainerFactory $plugins = $this->pluginList->getActivatedPlugins(); foreach ($plugins as $plugin) { - $baseDir = Manager::getPluginsDirectory() . $plugin; + $baseDir = Manager::getPluginDirectory($plugin); $file = $baseDir . '/config/config.php'; if (file_exists($file)) { |