summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorAngie Byron <webchick@24967.no-reply.drupal.org>2010-02-17 03:35:15 +0000
committerAngie Byron <webchick@24967.no-reply.drupal.org>2010-02-17 03:35:15 +0000
commitba468be638738cac5bb828f8f1fe50efbdd78eae (patch)
tree88d57ff8ce4c4bee65b5ce82bc6377b18a18aad9 /modules
parente2a01a03496176d796f8e2032b3fc928b1916f1e (diff)
downloadbrdo-ba468be638738cac5bb828f8f1fe50efbdd78eae.tar.gz
brdo-ba468be638738cac5bb828f8f1fe50efbdd78eae.tar.bz2
#658702 by Mike Wacker: Fixed shortcut derives automatic title for MENU_LOCAL_TASK based on parent page.
Diffstat (limited to 'modules')
-rw-r--r--modules/shortcut/shortcut.admin.inc4
1 files changed, 3 insertions, 1 deletions
diff --git a/modules/shortcut/shortcut.admin.inc b/modules/shortcut/shortcut.admin.inc
index 522b03ba6..75937f8da 100644
--- a/modules/shortcut/shortcut.admin.inc
+++ b/modules/shortcut/shortcut.admin.inc
@@ -505,8 +505,10 @@ function shortcut_link_delete_submit($form, &$form_state) {
*/
function shortcut_link_add_inline($shortcut_set) {
if (isset($_REQUEST['token']) && drupal_valid_token($_REQUEST['token'], 'shortcut-add-link') && shortcut_valid_link($_GET['link'])) {
+ $item = menu_get_item($_GET['link']);
+ $title = ($item && $item['title']) ? $item['title'] : $_GET['name'];
$link = array(
- 'link_title' => $_GET['name'],
+ 'link_title' => $title,
'link_path' => $_GET['link'],
);
shortcut_admin_add_link($link, $shortcut_set, shortcut_max_slots());