Commit f07bcffa authored by webchick's avatar webchick

Issue #2449743 by root_brute, tstoeckler: SwitchShortcutSet has an unnecessary...

Issue #2449743 by root_brute, tstoeckler: SwitchShortcutSet has an unnecessary dependency on the route match
parent 5cbaf8cc
......@@ -35,24 +35,14 @@ class SwitchShortcutSet extends FormBase {
*/
protected $shortcutSetStorage;
/**
* The current route match.
*
* @var \Drupal\Core\Routing\RouteMatchInterface
*/
protected $routeMatch;
/**
* Constructs a SwitchShortcutSet object.
*
* @param \Drupal\shortcut\ShortcutSetStorageInterface $shortcut_set_storage
* The shortcut set storage.
* @param \Drupal\Core\Routing\RouteMatchInterface $route_match
* The current route match.
*/
public function __construct(ShortcutSetStorageInterface $shortcut_set_storage, RouteMatchInterface $route_match) {
public function __construct(ShortcutSetStorageInterface $shortcut_set_storage) {
$this->shortcutSetStorage = $shortcut_set_storage;
$this->routeMatch = $route_match;
}
/**
......@@ -60,8 +50,7 @@ public function __construct(ShortcutSetStorageInterface $shortcut_set_storage, R
*/
public static function create(ContainerInterface $container) {
return new static(
$container->get('entity.manager')->getStorage('shortcut_set'),
$container->get('current_route_match')
$container->get('entity.manager')->getStorage('shortcut_set')
);
}
......@@ -196,7 +185,7 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
$replacements = array(
'%user' => $this->user->label(),
'%set_name' => $set->label(),
'@switch-url' => $this->url($this->routeMatch->getRouteName(), array('user' => $this->user->id())),
'@switch-url' => $this->url('<current>'),
);
if ($account_is_user) {
// Only administrators can create new shortcut sets, so we know they have
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment