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/API/Proxy.php | |
| 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/API/Proxy.php')
| -rw-r--r-- | core/API/Proxy.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/API/Proxy.php b/core/API/Proxy.php index 1f2ca5a59d..833e905372 100644 --- a/core/API/Proxy.php +++ b/core/API/Proxy.php @@ -442,7 +442,7 @@ class Proxy private function includeApiFile($fileName) { $module = self::getModuleNameFromClassName($fileName); - $path = Manager::getPluginsDirectory() . $module . '/API.php'; + $path = Manager::getPluginDirectory($module) . '/API.php'; if (is_readable($path)) { require_once $path; // prefixed by PIWIK_INCLUDE_PATH |