diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/plugin_commands.go | 2 | ||||
| -rw-r--r-- | app/plugin_install.go | 2 | ||||
| -rw-r--r-- | app/plugin_requests.go | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/plugin_commands.go b/app/plugin_commands.go index 060defc86..daa92ce5a 100644 --- a/app/plugin_commands.go +++ b/app/plugin_commands.go @@ -105,7 +105,7 @@ func (a *App) ExecutePluginCommand(args *model.CommandArgs) (*model.Command, *mo if err != nil { return pc.Command, nil, model.NewAppError("ExecutePluginCommand", "model.plugin_command.error.app_error", nil, "err="+err.Error(), http.StatusInternalServerError) } - response, appErr := pluginHooks.ExecuteCommand(plugin.NewBlankContext(), args) + response, appErr := pluginHooks.ExecuteCommand(&plugin.Context{}, args) return pc.Command, response, appErr } } diff --git a/app/plugin_install.go b/app/plugin_install.go index e49f6f83e..f96c75f06 100644 --- a/app/plugin_install.go +++ b/app/plugin_install.go @@ -52,7 +52,7 @@ func (a *App) installPlugin(pluginFile io.Reader) (*model.Manifest, *model.AppEr } if !plugin.IsValidId(manifest.Id) { - return nil, model.NewAppError("installPlugin", "app.plugin.invalid_id.app_error", map[string]interface{}{"Min": plugin.MinIdLength, "Max": plugin.MaxIdLength, "Regex": plugin.ValidId.String()}, "", http.StatusBadRequest) + return nil, model.NewAppError("installPlugin", "app.plugin.invalid_id.app_error", map[string]interface{}{"Min": plugin.MinIdLength, "Max": plugin.MaxIdLength, "Regex": plugin.ValidIdRegex}, "", http.StatusBadRequest) } bundles, err := a.Plugins.Available() diff --git a/app/plugin_requests.go b/app/plugin_requests.go index 10ef758b4..1c5a73e8c 100644 --- a/app/plugin_requests.go +++ b/app/plugin_requests.go @@ -72,5 +72,5 @@ func (a *App) servePluginRequest(w http.ResponseWriter, r *http.Request, handler r.URL.RawQuery = newQuery.Encode() r.URL.Path = strings.TrimPrefix(r.URL.Path, "/plugins/"+params["plugin_id"]) - handler(plugin.NewBlankContext(), w, r) + handler(&plugin.Context{}, w, r) } |