diff options
| author | webchick <webchick@24967.no-reply.drupal.org> | 2011-09-30 12:59:38 -0700 |
|---|---|---|
| committer | webchick <webchick@24967.no-reply.drupal.org> | 2011-09-30 12:59:38 -0700 |
| commit | 39994dd88f83bd20a72ee1b39e9e16854266e146 (patch) | |
| tree | 40cb4fba07f4ceaf44a77f329bcc0c1c1a40affe /modules/shortcut/shortcut.module | |
| parent | c80806ab7531f0571a4c7bd842238bba13ab383d (diff) | |
| download | brdo-39994dd88f83bd20a72ee1b39e9e16854266e146.tar.gz brdo-39994dd88f83bd20a72ee1b39e9e16854266e146.tar.bz2 | |
Issue #790770 by swentel, jhodgdon, David_Rothstein, naxoc: Fixed 'Add to shortcuts' link should not appear on 403/404 pages.
Diffstat (limited to 'modules/shortcut/shortcut.module')
| -rw-r--r-- | modules/shortcut/shortcut.module | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/modules/shortcut/shortcut.module b/modules/shortcut/shortcut.module index 8642d9de7..f8ddcc24f 100644 --- a/modules/shortcut/shortcut.module +++ b/modules/shortcut/shortcut.module @@ -643,7 +643,11 @@ function shortcut_renderable_links($shortcut_set = NULL) { * Implements hook_preprocess_page(). */ function shortcut_preprocess_page(&$variables) { - if (shortcut_set_edit_access()) { + // Only display the shortcut link if the user has the ability to edit + // shortcuts and if the page's actual content is being shown (for example, + // we do not want to display it on "access denied" or "page not found" + // pages). + if (shortcut_set_edit_access() && ($item = menu_get_item()) && $item['access']) { $link = $_GET['q']; $query_parameters = drupal_get_query_parameters(); if (!empty($query_parameters)) { |