diff options
| author | Dries Buytaert <dries@buytaert.net> | 2004-11-24 22:50:25 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2004-11-24 22:50:25 +0000 |
| commit | 4e4e2aa7770a43c27a421b3f759160094f7d3191 (patch) | |
| tree | 286a0ddb1b6d6b99a14b9cf708285b58c79560ab | |
| parent | 5d759ccbb9764e4c0328ce7fc4a83df8b958cf85 (diff) | |
| download | brdo-4e4e2aa7770a43c27a421b3f759160094f7d3191.tar.gz brdo-4e4e2aa7770a43c27a421b3f759160094f7d3191.tar.bz2 | |
- Patch #13443 by Moshe: got rid of the semi-implemented 'page link' feature. All themes currently support primary and secondary links so page links are now deprecated. Check your contributed modules and update them accordingly.
| -rw-r--r-- | includes/common.inc | 18 | ||||
| -rw-r--r-- | includes/theme.inc | 8 |
2 files changed, 1 insertions, 25 deletions
diff --git a/includes/common.inc b/includes/common.inc index 3da8bda85..911549e0c 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -1578,24 +1578,6 @@ function field_set($string, $name, $value) { } /** - * Fetch a set of global navigation links. - * - * The links are gathered by calls to hook_link('page') in each module. - */ -function link_page() { - global $custom_links; - - if (is_array($custom_links)) { - return $custom_links; - } - else { - $links = module_invoke_all('link', 'page'); - array_unshift($links, l(t('home'), '', array('title' => t('Return to the main page.')))); - return $links; - } -} - -/** * Perform end-of-request tasks. * * This function sets the page cache if appropriate, and allows modules to diff --git a/includes/theme.inc b/includes/theme.inc index 8a32f389d..2cc2b02e4 100644 --- a/includes/theme.inc +++ b/includes/theme.inc @@ -284,12 +284,7 @@ function theme_get_setting($setting_name, $refresh = FALSE) { } } - if ($settings['toggle_primary_links']) { - if (!$settings['primary_links']) { - $settings['primary_links'] = theme('links', link_page()); - } - } - else { + if (!$settings['toggle_primary_links']) { $settings['primary_links'] = ''; } @@ -370,7 +365,6 @@ function theme_page($content, $title = NULL, $breadcrumb = NULL) { $output .= ' <body style="background-color: #fff; color: #000;"'. theme('onload_attribute'). '">'; $output .= '<table border="0" cellspacing="4" cellpadding="4"><tr><td style="vertical-align: top; width: 170px;">'; - $output .= theme('box', t('Navigation'), @implode('<br />', link_page())); $output .= theme('blocks', 'all'); $output .= '</td><td style="vertical-align: top;">'; |