Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Steur <thomas.steur@gmail.com>2013-09-18 01:44:05 +0400
committerThomas Steur <thomas.steur@gmail.com>2013-09-18 01:44:05 +0400
commit57a0bc0302bf62939fc7f5df35e14f8ebad0fcd3 (patch)
tree616c10582b547ec1dc533d429e0fc3a2295123e2 /plugins/CorePluginsAdmin/PluginInstaller.php
parent8b9b33f550ac2c4479d142f4d3cabd6d665a0088 (diff)
installer should work now with new plugin folder structure
Diffstat (limited to 'plugins/CorePluginsAdmin/PluginInstaller.php')
-rw-r--r--plugins/CorePluginsAdmin/PluginInstaller.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/plugins/CorePluginsAdmin/PluginInstaller.php b/plugins/CorePluginsAdmin/PluginInstaller.php
index f9c04d8a7f..192264feca 100644
--- a/plugins/CorePluginsAdmin/PluginInstaller.php
+++ b/plugins/CorePluginsAdmin/PluginInstaller.php
@@ -83,7 +83,7 @@ class PluginInstaller
private function makeSurePluginJsonExists($tmpPluginFolder)
{
- if (!file_exists($tmpPluginFolder . '/plugin.json')) {
+ if (!file_exists($tmpPluginFolder . '/' . $this->pluginName . '/plugin.json')) {
throw new \Exception('It is not a valid Plugin, missing plugin.json');
}
}
@@ -93,7 +93,8 @@ class PluginInstaller
$pluginTargetPath = PIWIK_USER_PATH . self::PATH_TO_EXTRACT . $this->pluginName;
$this->removeFolderIfExists($pluginTargetPath);
- Filesystem::copyRecursive($tmpPluginFolder, $pluginTargetPath);
+
+ Filesystem::copyRecursive($tmpPluginFolder, PIWIK_USER_PATH . self::PATH_TO_EXTRACT);
}
/**