From 3a98850de7b45e31bd610968ef0330e1e511018d Mon Sep 17 00:00:00 2001
From: catch <catch@35733.no-reply.drupal.org>
Date: Mon, 13 May 2013 22:11:33 +0100
Subject: [PATCH] Issue #1991092 by David_Rothstein: Fixed 'Edit shortcuts'
link in the toolbar points to a nonexistent page (as does the 'add shortcuts'
link on an empty shortcut set).
---
core/modules/shortcut/shortcut.admin.inc | 2 +-
core/modules/shortcut/shortcut.module | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/core/modules/shortcut/shortcut.admin.inc b/core/modules/shortcut/shortcut.admin.inc
index ed38a4a984e0..2f7acf6ea683 100644
--- a/core/modules/shortcut/shortcut.admin.inc
+++ b/core/modules/shortcut/shortcut.admin.inc
@@ -283,7 +283,7 @@ function theme_shortcut_set_customize($variables) {
}
$header = array(t('Name'), t('Weight'), t('Operations'));
- $output = theme('table', array('header' => $header, 'rows' => $rows, 'attributes' => array('id' => 'shortcuts'), 'empty' => t('No shortcuts available. <a href="@link">Add a shortcut</a>.', array('@link' => url('admin/config/user-interface/shortcut/' . $form['#shortcut_set_name'] . '/add-link')))));
+ $output = theme('table', array('header' => $header, 'rows' => $rows, 'attributes' => array('id' => 'shortcuts'), 'empty' => t('No shortcuts available. <a href="@link">Add a shortcut</a>.', array('@link' => url('admin/config/user-interface/shortcut/manage/' . $form['#shortcut_set_name'] . '/add-link')))));
$output .= drupal_render($form['actions']);
$output = drupal_render_children($form) . $output;
return $output;
diff --git a/core/modules/shortcut/shortcut.module b/core/modules/shortcut/shortcut.module
index 806c1675897b..d1458a85940d 100644
--- a/core/modules/shortcut/shortcut.module
+++ b/core/modules/shortcut/shortcut.module
@@ -528,7 +528,7 @@ function shortcut_toolbar() {
$configure_link = array(
'#type' => 'link',
'#title' => t('Edit shortcuts'),
- '#href' => 'admin/config/user-interface/shortcut/' . $shortcut_set->id(),
+ '#href' => 'admin/config/user-interface/shortcut/manage/' . $shortcut_set->id(),
'#options' => array('attributes' => array('class' => array('edit-shortcuts'))),
);
}
--
GitLab