diff --git a/core/lib/Drupal/Core/Controller/ControllerBase.php b/core/lib/Drupal/Core/Controller/ControllerBase.php index 25abd71..ca47fe6 100644 --- a/core/lib/Drupal/Core/Controller/ControllerBase.php +++ b/core/lib/Drupal/Core/Controller/ControllerBase.php @@ -169,15 +169,15 @@ protected function languageManager() { * * @param string $route_name * The name of the route to which to redirect. - * @param array $parameters + * @param array $route_parameters * Parameters for the route. * @param int $status * The HTTP redirect status code for the redirect. The default is 302 Found. * @return \Symfony\Component\HttpFoundation\RedirectResponse * A redirect response object that may be returned by the controller. */ - public function redirect($route_name, array $parameters = array(), $status = 302) { - $url = $this->container->get('url_generator')->generate($route_name, $parameters, TRUE); + public function redirect($route_name, array $route_parameters = array(), $status = 302) { + $url = $this->container->get('url_generator')->generate($route_name, $route_parameters, TRUE); return new RedirectResponse($url, $status); } @@ -190,7 +190,7 @@ public function redirect($route_name, array $parameters = array(), $status = 302 * * @param string $route_name * The name of the route - * @param array $parameters + * @param array $route_parameters * An associative array of parameter names and values. * @param array $options * (optional) An associative array of additional options, with the following @@ -221,8 +221,8 @@ public function redirect($route_name, array $parameters = array(), $status = 302 * Thrown when a parameter value for a placeholder is not correct because it * does not match the requirement. */ - public function url($route_name, $parameters = array(), $options = array()) { - return $this->container->get('url_generator')->generateFromRoute($route_name, $parameters, $options); + public function url($route_name, $route_parameters = array(), $options = array()) { + return $this->container->get('url_generator')->generateFromRoute($route_name, $route_parameters, $options); } } diff --git a/core/lib/Drupal/Core/Form/FormBase.php b/core/lib/Drupal/Core/Form/FormBase.php index 534e764..0331c85 100644 --- a/core/lib/Drupal/Core/Form/FormBase.php +++ b/core/lib/Drupal/Core/Form/FormBase.php @@ -84,7 +84,7 @@ protected function t($string, array $args = array(), array $options = array()) { * * @param string $route_name * The name of the route - * @param array $parameters + * @param array $route_parameters * An associative array of parameter names and values. * @param array $options * (optional) An associative array of additional options, with the following @@ -115,8 +115,8 @@ protected function t($string, array $args = array(), array $options = array()) { * Thrown when a parameter value for a placeholder is not correct because it * does not match the requirement. */ - public function url($route_name, $parameters = array(), $options = array()) { - return $this->getUrlGenerator()->generateFromRoute($route_name, $parameters, $options); + public function url($route_name, $route_parameters = array(), $options = array()) { + return $this->getUrlGenerator()->generateFromRoute($route_name, $route_parameters, $options); } /** diff --git a/core/modules/shortcut/lib/Drupal/shortcut/Controller/ShortcutSetController.php b/core/modules/shortcut/lib/Drupal/shortcut/Controller/ShortcutSetController.php index cd952fb..7123ae5 100644 --- a/core/modules/shortcut/lib/Drupal/shortcut/Controller/ShortcutSetController.php +++ b/core/modules/shortcut/lib/Drupal/shortcut/Controller/ShortcutSetController.php @@ -50,7 +50,7 @@ public function addShortcutLinkInline(ShortcutSetInterface $shortcut_set, Reques else { drupal_set_message(t('Unable to add a shortcut for %title.', array('%title' => $link['link_title']))); } - return $this->redirect('front'); + return $this->redirect(''); } throw new AccessDeniedHttpException();