From 4ab5b2abf3cdb69e2734cb3bc694211171019b49 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Tue, 18 Nov 2014 13:12:30 +0100 Subject: [PATCH] Fix anonymous onSuccess callbacks --- application/controllers/ConfigController.php | 8 ++++---- .../application/controllers/ConfigController.php | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php index 105338dfb..8f5f9eb42 100644 --- a/application/controllers/ConfigController.php +++ b/application/controllers/ConfigController.php @@ -177,10 +177,10 @@ class ConfigController extends ActionController public function removeauthenticationbackendAction() { $form = new ConfirmRemovalForm(array( - 'onSuccess' => function ($request) { + 'onSuccess' => function ($form) { $configForm = new AuthenticationBackendConfigForm(); $configForm->setIniConfig(Config::app('authentication')); - $authBackend = $request->getQuery('auth_backend'); + $authBackend = $form->getRequest()->getQuery('auth_backend'); try { $configForm->remove($authBackend); @@ -250,10 +250,10 @@ class ConfigController extends ActionController public function removeresourceAction() { $form = new ConfirmRemovalForm(array( - 'onSuccess' => function ($request) { + 'onSuccess' => function ($form) { $configForm = new ResourceConfigForm(); $configForm->setIniConfig(Config::app('resources')); - $resource = $request->getQuery('resource'); + $resource = $form->getRequest()->getQuery('resource'); try { $configForm->remove($resource); diff --git a/modules/monitoring/application/controllers/ConfigController.php b/modules/monitoring/application/controllers/ConfigController.php index 1e961d26e..ed5d57570 100644 --- a/modules/monitoring/application/controllers/ConfigController.php +++ b/modules/monitoring/application/controllers/ConfigController.php @@ -60,8 +60,8 @@ class Monitoring_ConfigController extends ModuleActionController { $config = $this->Config('backends'); $form = new ConfirmRemovalForm(array( - 'onSuccess' => function ($request) use ($config) { - $backendName = $request->getQuery('backend'); + 'onSuccess' => function ($form) use ($config) { + $backendName = $form->getRequest()->getQuery('backend'); $configForm = new BackendConfigForm(); $configForm->setIniConfig($config); @@ -92,8 +92,8 @@ class Monitoring_ConfigController extends ModuleActionController { $config = $this->Config('instances'); $form = new ConfirmRemovalForm(array( - 'onSuccess' => function ($request) use ($config) { - $instanceName = $request->getQuery('instance'); + 'onSuccess' => function ($form) use ($config) { + $instanceName = $form->getRequest()->getQuery('instance'); $configForm = new InstanceConfigForm(); $configForm->setIniConfig($config);