Commit 4e4e2aa7 authored by Dries's avatar Dries

- Patch #13443 by Moshe: got rid of the semi-implemented 'page link' feature....

- 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.
parent 5d759ccb
......@@ -1577,24 +1577,6 @@ function field_set($string, $name, $value) {
return substr($rval, 1);
}
/**
* 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.
*
......
......@@ -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;">';
......
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