summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2017-11-16 08:46:16 -0800
committerChristopher Speller <crspeller@gmail.com>2017-11-16 08:46:16 -0800
commit95133098792e44d5c7fadb87f0199a0a8c2b7cee (patch)
tree96124b49d581d3a081723014ebaa4a003b98aac1 /app
parentbf6bb9bce9723799991478e5aea745686045ad65 (diff)
parenta0017f184578d4d6250a9b54b50e656524078949 (diff)
downloadchat-95133098792e44d5c7fadb87f0199a0a8c2b7cee.tar.gz
chat-95133098792e44d5c7fadb87f0199a0a8c2b7cee.tar.bz2
chat-95133098792e44d5c7fadb87f0199a0a8c2b7cee.zip
Merge branch 'release-4.4'
Diffstat (limited to 'app')
-rw-r--r--app/plugins.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/plugins.go b/app/plugins.go
index 0ce669290..43b7a7451 100644
--- a/app/plugins.go
+++ b/app/plugins.go
@@ -358,7 +358,7 @@ func (a *App) InstallPlugin(pluginFile io.Reader) (*model.Manifest, *model.AppEr
return nil, model.NewAppError("UnpackAndActivatePlugin", "app.plugin.manifest.app_error", nil, err.Error(), http.StatusBadRequest)
}
- os.Rename(tmpPluginDir, filepath.Join(a.PluginEnv.SearchPath(), manifest.Id))
+ err = utils.CopyDir(tmpPluginDir, filepath.Join(a.PluginEnv.SearchPath(), manifest.Id))
if err != nil {
return nil, model.NewAppError("UnpackAndActivatePlugin", "app.plugin.mvdir.app_error", nil, err.Error(), http.StatusInternalServerError)
}