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

1 files changed, 5 insertions, 4 deletions

diff --git a/plugins/CorePluginsAdmin/PluginInstaller.php b/plugins/CorePluginsAdmin/PluginInstaller.php
index d2fad35c76..09ec89de59 100644
--- a/plugins/CorePluginsAdmin/PluginInstaller.php
+++ b/plugins/CorePluginsAdmin/PluginInstaller.php
@@ -15,6 +15,7 @@ use Piwik\Filesystem;
 use Piwik\Piwik;
 use Piwik\Plugin\Manager as PluginManager;
 use Piwik\Plugin\Dependency as PluginDependency;
+use Piwik\Plugin\Manager;
 use Piwik\Plugins\Marketplace\Marketplace;
 use Piwik\Unzip;
 use Piwik\Plugins\Marketplace\Api\Client;
@@ -25,7 +26,6 @@ use Piwik\Plugins\Marketplace\Api\Client;
 class PluginInstaller
 {
     const PATH_TO_DOWNLOAD = '/latest/plugins/';
-    const PATH_TO_EXTRACT = '/plugins/';
 
     private $pluginName;
 
@@ -131,7 +131,7 @@ class PluginInstaller
     {
         Filechecks::dieIfDirectoriesNotWritable(array(
             StaticContainer::get('path.tmp') . self::PATH_TO_DOWNLOAD,
-            self::PATH_TO_EXTRACT
+            Manager::getPluginsDirectory()
         ));
     }
 
@@ -294,11 +294,12 @@ class PluginInstaller
 
     private function copyPluginToDestination($tmpPluginFolder)
     {
-        $pluginTargetPath = PIWIK_USER_PATH . self::PATH_TO_EXTRACT . $this->pluginName;
+        $pluginsDir = Manager::getPluginsDirectory();
+        $pluginTargetPath = $pluginsDir . $this->pluginName;
 
         $this->removeFolderIfExists($pluginTargetPath);
 
-        Filesystem::copyRecursive($tmpPluginFolder, PIWIK_USER_PATH . self::PATH_TO_EXTRACT);
+        Filesystem::copyRecursive($tmpPluginFolder, $pluginsDir);
     }
 
     /**