diff --git a/core/includes/form.inc b/core/includes/form.inc index ffef237..7365f29 100644 --- a/core/includes/form.inc +++ b/core/includes/form.inc @@ -1327,11 +1327,14 @@ function drupal_redirect_form($form_state) { } // Check for a route-based redirection. if (isset($form_state['redirect_route'])) { + // @todo Decide whether we want to support to just pass a route_name only. // Ensure there is something to pass as the route parameters. $form_state['redirect_route'] += array( 'route_parameters' => array(), + 'options' => array(), ); - $url = \Drupal::urlGenerator()->generate($form_state['redirect_route']['route_name'], $form_state['redirect_route']['route_parameters'], TRUE); + $options['absolute'] = TRUE; + $url = \Drupal::urlGenerator()->generateFromRoute($form_state['redirect_route']['route_name'], $form_state['redirect_route']['route_parameters'], $options); return new RedirectResponse($url); } // Only invoke a redirection if redirect value was not set to FALSE. diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ReorderDisplays.php b/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ReorderDisplays.php index 512ab2a..81f6018 100644 --- a/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ReorderDisplays.php +++ b/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ReorderDisplays.php @@ -186,7 +186,11 @@ public function submitForm(array &$form, array &$form_state) { // Store in cache. $view->cacheSet(); - $form_state['redirect'] = array('admin/structure/views/view/' . $view->id() . '/edit', array('fragment' => 'views-tab-default')); + $form_state['redirect_route'] = array( + 'route_name' => 'views_ui.operation', + 'route_parameters' => array('view' => $view->id(), 'operation' => 'edit'), + 'options' => array('fragment' => 'views-tab-default'), + ); } }