From faa8c3892b93b37cb358b4efae5ee387317982a1 Mon Sep 17 00:00:00 2001 From: Thomas Steur Date: Wed, 30 Jan 2019 13:28:01 +1300 Subject: Don't hardcode plugins directory (#14043) * do not hard code plugins directory * remove method that is not needed for now * use plugins directory in more places --- core/Updater.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'core/Updater.php') diff --git a/core/Updater.php b/core/Updater.php index ba9a0caa83..2bb6ebcb2d 100644 --- a/core/Updater.php +++ b/core/Updater.php @@ -10,6 +10,7 @@ namespace Piwik; use Piwik\Columns\Updater as ColumnUpdater; use Piwik\Container\StaticContainer; +use Piwik\Plugin\Manager; use Piwik\Plugins\Installation\ServerFilesGenerator; use Piwik\Updater\Migration; use Piwik\Updater\Migration\Db\Sql; @@ -62,7 +63,7 @@ class Updater public function __construct($pathUpdateFileCore = null, $pathUpdateFilePlugins = null, Columns\Updater $columnsUpdater = null) { $this->pathUpdateFileCore = $pathUpdateFileCore ?: PIWIK_INCLUDE_PATH . '/core/Updates/'; - $this->pathUpdateFilePlugins = $pathUpdateFilePlugins ?: PIWIK_INCLUDE_PATH . '/plugins/%s/Updates/'; + $this->pathUpdateFilePlugins = $pathUpdateFilePlugins ?: Manager::getPluginsDirectory() . '%s/Updates/'; $this->columnsUpdater = $columnsUpdater ?: new Columns\Updater(); self::$activeInstance = $this; -- cgit v1.2.3