Index: modules/blog/blog.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/blog/blog.module,v
retrieving revision 1.342
diff -u -p -r1.342 blog.module
--- modules/blog/blog.module 26 Nov 2009 06:49:28 -0000 1.342
+++ modules/blog/blog.module 2 Dec 2009 02:16:07 -0000
@@ -86,7 +86,7 @@ function blog_node_view($node, $build_mo
'attributes' => array('title' => t("Read !username's latest blog entries.", array('!username' => format_username($node)))),
);
$node->content['links']['blog'] = array(
- '#theme' => 'links',
+ '#theme' => array('links__blog_node', 'links'),
'#links' => $links,
'#attributes' => array('class' => array('links', 'inline')),
);
Index: modules/book/book.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/book/book.module,v
retrieving revision 1.527
diff -u -p -r1.527 book.module
--- modules/book/book.module 1 Dec 2009 13:14:42 -0000 1.527
+++ modules/book/book.module 2 Dec 2009 02:16:07 -0000
@@ -113,7 +113,7 @@ function book_node_view_link($node, $bui
if (!empty($links)) {
$node->content['links']['book'] = array(
- '#theme' => 'links',
+ '#theme' => array('links__book_node', 'links'),
'#links' => $links,
'#attributes' => array('class' => array('links', 'inline')),
);
Index: modules/comment/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v
retrieving revision 1.812
diff -u -p -r1.812 comment.module
--- modules/comment/comment.module 1 Dec 2009 16:03:35 -0000 1.812
+++ modules/comment/comment.module 2 Dec 2009 02:16:07 -0000
@@ -552,7 +552,7 @@ function comment_node_view($node, $build
}
$node->content['links']['comment'] = array(
- '#theme' => 'links',
+ '#theme' => array('links__comment_node', 'links'),
'#links' => $links,
'#attributes' => array('class' => array('links', 'inline')),
);
@@ -840,7 +840,7 @@ function comment_build_content($comment,
if (empty($comment->in_preview)) {
$comment->content['links']['comment'] = array(
- '#theme' => 'links',
+ '#theme' => array('links__comment', 'links'),
'#links' => comment_links($comment, $node),
'#attributes' => array('class' => array('links', 'inline')),
);
Index: modules/forum/forums.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/forum/forums.tpl.php,v
retrieving revision 1.6
diff -u -p -r1.6 forums.tpl.php
--- modules/forum/forums.tpl.php 9 Oct 2009 00:59:59 -0000 1.6
+++ modules/forum/forums.tpl.php 2 Dec 2009 02:16:07 -0000
@@ -20,7 +20,7 @@
?>
- $links)); ?>
+ $links)); ?>
Index: modules/locale/locale.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/locale/locale.module,v
retrieving revision 1.272
diff -u -p -r1.272 locale.module
--- modules/locale/locale.module 2 Dec 2009 00:28:43 -0000 1.272
+++ modules/locale/locale.module 2 Dec 2009 02:16:07 -0000
@@ -885,7 +885,7 @@ function locale_block_view($type) {
if (isset($links->links) && count($links->links > 1)) {
$class = "language-switcher-{$links->provider}";
$variables = array('links' => $links->links, 'attributes' => array('class' => array($class)));
- $block['content'] = theme('links', $variables);
+ $block['content'] = theme(array('links__locale_block', 'links'), $variables);
$block['subject'] = t('Languages');
return $block;
}
Index: modules/node/node.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.admin.inc,v
retrieving revision 1.78
diff -u -p -r1.78 node.admin.inc
--- modules/node/node.admin.inc 17 Nov 2009 02:50:41 -0000 1.78
+++ modules/node/node.admin.inc 2 Dec 2009 02:16:07 -0000
@@ -394,7 +394,7 @@ function node_admin_content($form, $form
// Show the 'add new content' link.
$form['add_content'] = array(
'#access' => _node_add_access(),
- '#markup' => theme('links', array('links' => array(array('title' => t('Add new content'), 'href' => 'node/add')), 'attributes' => array('class' => array('action-links')))),
+ '#markup' => theme(array('links__node_admin', 'links'), array('links' => array(array('title' => t('Add new content'), 'href' => 'node/add')), 'attributes' => array('class' => array('action-links')))),
);
$form['filter'] = node_filter_form();
$form['#submit'][] = 'node_filter_form_submit';
@@ -522,7 +522,7 @@ function node_admin_nodes() {
// Render an unordered list of operations links.
$options[$node->nid]['operations'] = array(
'data' => array(
- '#theme' => 'links',
+ '#theme' => array('links__node_operations', 'links'),
'#links' => $operations,
'#attributes' => array('class' => array('links', 'inline')),
),
Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.1171
diff -u -p -r1.1171 node.module
--- modules/node/node.module 1 Dec 2009 13:14:42 -0000 1.1171
+++ modules/node/node.module 2 Dec 2009 02:16:07 -0000
@@ -1229,7 +1229,7 @@ function node_build_content($node, $buil
);
}
$node->content['links']['node'] = array(
- '#theme' => 'links',
+ '#theme' => array('links__node', 'links'),
'#links' => $links,
'#attributes' => array('class' => array('links', 'inline')),
);
Index: modules/poll/poll.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/poll/poll.module,v
retrieving revision 1.326
diff -u -p -r1.326 poll.module
--- modules/poll/poll.module 1 Dec 2009 13:14:42 -0000 1.326
+++ modules/poll/poll.module 2 Dec 2009 02:16:07 -0000
@@ -811,7 +811,7 @@ function theme_poll_choices($variables)
* @see theme_poll_results()
*/
function template_preprocess_poll_results(&$variables) {
- $variables['links'] = theme('links', array('links' => $variables['raw_links']));
+ $variables['links'] = theme(array('links__poll_results', 'links'), array('links' => $variables['raw_links']));
if (isset($variables['vote']) && $variables['vote'] > -1 && user_access('cancel own vote')) {
$variables['cancel_form'] = drupal_render(drupal_get_form('poll_cancel_form', $variables['nid']));
}
Index: modules/statistics/statistics.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/statistics/statistics.module,v
retrieving revision 1.326
diff -u -p -r1.326 statistics.module
--- modules/statistics/statistics.module 1 Dec 2009 13:14:42 -0000 1.326
+++ modules/statistics/statistics.module 2 Dec 2009 02:16:07 -0000
@@ -117,7 +117,7 @@ function statistics_node_view($node, $bu
}
$node->content['links']['statistics'] = array(
- '#theme' => 'links',
+ '#theme' => array('links__statistics_node', 'links'),
'#links' => $links,
'#attributes' => array('class' => array('links', 'inline')),
);
Index: modules/system/page.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/page.tpl.php,v
retrieving revision 1.39
diff -u -p -r1.39 page.tpl.php
--- modules/system/page.tpl.php 20 Nov 2009 04:20:38 -0000 1.39
+++ modules/system/page.tpl.php 2 Dec 2009 02:16:07 -0000
@@ -98,7 +98,7 @@
- $main_menu, 'attributes' => array('id' => 'main-menu', 'class' => array('links', 'clearfix')), 'heading' => t('Main menu'))); ?>
+ $main_menu, 'attributes' => array('id' => 'main-menu', 'class' => array('links', 'clearfix')), 'heading' => t('Main menu'))); ?>
@@ -136,7 +136,7 @@
Index: modules/system/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.module,v
retrieving revision 1.851
diff -u -p -r1.851 system.module
--- modules/system/system.module 2 Dec 2009 00:14:26 -0000 1.851
+++ modules/system/system.module 2 Dec 2009 02:16:47 -0000
@@ -3650,7 +3650,7 @@ function system_build_contextual_links($
$build = array(
'#prefix' => '',
'#suffix' => '
',
- '#theme' => 'links',
+ '#theme' => array('links__system_contextual_links', 'links'),
'#links' => $links,
'#attributes' => array('class' => array('contextual-links')),
'#attached' => array(
Index: modules/toolbar/toolbar.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/toolbar/toolbar.module,v
retrieving revision 1.23
diff -u -p -r1.23 toolbar.module
--- modules/toolbar/toolbar.module 1 Dec 2009 13:14:43 -0000 1.23
+++ modules/toolbar/toolbar.module 2 Dec 2009 02:16:07 -0000
@@ -161,7 +161,7 @@ function toolbar_build() {
$links = toolbar_menu_navigation_links(toolbar_get_menu_tree());
$system_menus = menu_list_system_menus();
$build['toolbar_menu'] = array(
- '#theme' => 'links',
+ '#theme' => array('links__toolbar_menu', 'links'),
'#links' => $links,
'#attributes' => array('id' => 'toolbar-menu'),
'#heading' => array('text' => t($system_menus['management']), 'level' => 'h2', 'class' => 'element-invisible'),
@@ -190,7 +190,7 @@ function toolbar_build() {
);
}
$build['toolbar_user'] = array(
- '#theme' => 'links',
+ '#theme' => array('links__toolbar_user', 'links'),
'#links' => $links,
'#attributes' => array('id' => 'toolbar-user'),
);
Index: modules/translation/translation.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/translation/translation.module,v
retrieving revision 1.65
diff -u -p -r1.65 translation.module
--- modules/translation/translation.module 1 Dec 2009 13:14:43 -0000 1.65
+++ modules/translation/translation.module 2 Dec 2009 02:16:07 -0000
@@ -176,7 +176,7 @@ function translation_node_view($node, $b
// Do not show link to the same node.
unset($links[$node->language]);
$node->content['links']['translation'] = array(
- '#theme' => 'links',
+ '#theme' => array('links__translation_node', 'links'),
'#links' => $links,
'#attributes' => array('class' => array('links', 'inline')),
);
Index: modules/update/update.report.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/update/update.report.inc,v
retrieving revision 1.27
diff -u -p -r1.27 update.report.inc
--- modules/update/update.report.inc 23 Oct 2009 22:24:19 -0000 1.27
+++ modules/update/update.report.inc 2 Dec 2009 02:16:07 -0000
@@ -300,7 +300,7 @@ function theme_update_version($variables
'title' => t('Release notes'),
'href' => $version['release_link'],
);
- $output .= theme('links', array('links' => $links));
+ $output .= theme(array('links__update_version', 'links'), array('links' => $links));
$output .= '';
$output .= '';
$output .= "\n";
Index: modules/upload/upload.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/upload/upload.module,v
retrieving revision 1.271
diff -u -p -r1.271 upload.module
--- modules/upload/upload.module 1 Dec 2009 13:14:43 -0000 1.271
+++ modules/upload/upload.module 2 Dec 2009 02:16:07 -0000
@@ -74,7 +74,7 @@ function upload_node_links($node, $build
'fragment' => 'attachments'
);
$node->content['links']['upload_attachments'] = array(
- '#theme' => 'links',
+ '#theme' => array('links__upload_node', 'links'),
'#links' => $links,
'#attributes' => array('class' => array('links', 'inline')),
);
Index: themes/garland/template.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/template.php,v
retrieving revision 1.35
diff -u -p -r1.35 template.php
--- themes/garland/template.php 1 Dec 2009 15:57:40 -0000 1.35
+++ themes/garland/template.php 2 Dec 2009 02:16:07 -0000
@@ -58,7 +58,7 @@ function garland_process_html(&$vars) {
function garland_preprocess_page(&$vars) {
$vars['tabs2'] = menu_secondary_local_tasks();
if (isset($vars['main_menu'])) {
- $vars['primary_nav'] = theme('links', array(
+ $vars['primary_nav'] = theme(array('links__system_main_menu', 'links'), array(
'links' => $vars['main_menu'],
'attributes' => array(
'class' => array('links', 'main-menu'),
@@ -74,7 +74,7 @@ function garland_preprocess_page(&$vars)
$vars['primary_nav'] = FALSE;
}
if (isset($vars['secondary_menu'])) {
- $vars['secondary_nav'] = theme('links', array(
+ $vars['secondary_nav'] = theme(array('links__system_secondary_menu', 'links'), array(
'links' => $vars['secondary_menu'],
'attributes' => array(
'class' => array('links', 'secondary-menu'),