commit 33d99ffaf0e89478ae68829c6eacdd07529220b5 Author: Pancho Date: Sat May 18 13:49:52 2013 +0200 1993202-3 diff --git a/core/modules/system/lib/Drupal/system/Form/ModulesUninstallForm.php b/core/modules/system/lib/Drupal/system/Form/ModulesUninstallForm.php index f66c361..40894d8 100644 --- a/core/modules/system/lib/Drupal/system/Form/ModulesUninstallForm.php +++ b/core/modules/system/lib/Drupal/system/Form/ModulesUninstallForm.php @@ -7,14 +7,13 @@ namespace Drupal\system\Form; -use Drupal\Core\ControllerInterface; use Drupal\Core\Form\FormInterface; use Symfony\Component\DependencyInjection\ContainerInterface; /** * {@inheritdoc} */ -class ModulesUninstallForm implements FormInterface, ControllerInterface { +class ModulesUninstallForm implements FormInterface { /** * {@inheritdoc} @@ -114,7 +113,7 @@ class ModulesUninstallForm implements FormInterface, ControllerInterface { // Form submitted, but no modules selected. if (!count(array_filter($form_state['values']['uninstall']))) { drupal_set_message(t('No modules selected.'), 'error'); - drupal_goto('admin/modules/uninstall'); + $form_state['redirect'] = 'admin/modules/uninstall'; } } diff --git a/core/modules/system/system.module b/core/modules/system/system.module index 9f8e3ec..c296b72 100644 --- a/core/modules/system/system.module +++ b/core/modules/system/system.module @@ -771,15 +771,13 @@ function system_menu() { ); $items['admin/modules/uninstall'] = array( 'title' => 'Uninstall', - 'route name' => 'system_modules_uninstall', - 'page callback' => 'USES ROUTE', - 'access callback' => TRUE, + 'route_name' => 'system_modules_uninstall', 'type' => MENU_LOCAL_TASK, 'weight' => 20, ); $items['admin/modules/uninstall/confirm'] = array( 'title' => 'Uninstall', - 'route name' => 'system_modules_uninstall_confirm', + 'route_name' => 'system_modules_uninstall_confirm', 'type' => MENU_VISIBLE_IN_BREADCRUMB, );