Index: modules/blog/blog.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/blog/blog.module,v
retrieving revision 1.348
diff -u -p -r1.348 blog.module
--- modules/blog/blog.module 26 Dec 2009 16:50:08 -0000 1.348
+++ modules/blog/blog.module 3 Jan 2010 02:22:25 -0000
@@ -86,7 +86,7 @@ function blog_node_view($node, $view_mod
'attributes' => array('title' => t("Read !username's latest blog entries.", array('!username' => format_username($node)))),
);
$node->content['links']['blog'] = array(
- '#theme' => 'links',
+ '#theme' => 'links__blog_node',
'#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.533
diff -u -p -r1.533 book.module
--- modules/book/book.module 29 Dec 2009 04:23:53 -0000 1.533
+++ modules/book/book.module 3 Jan 2010 02:22:25 -0000
@@ -113,7 +113,7 @@ function book_node_view_link($node, $vie
if (!empty($links)) {
$node->content['links']['book'] = array(
- '#theme' => 'links',
+ '#theme' => 'links__book_node',
'#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.822
diff -u -p -r1.822 comment.module
--- modules/comment/comment.module 26 Dec 2009 16:50:08 -0000 1.822
+++ modules/comment/comment.module 3 Jan 2010 02:22:25 -0000
@@ -573,7 +573,7 @@ function comment_node_view($node, $view_
}
$node->content['links']['comment'] = array(
- '#theme' => 'links',
+ '#theme' => 'links__comment_node',
'#links' => $links,
'#attributes' => array('class' => array('links', 'inline')),
);
@@ -860,7 +860,7 @@ function comment_build_content($comment,
if (empty($comment->in_preview)) {
$comment->content['links']['comment'] = array(
- '#theme' => 'links',
+ '#theme' => 'links__comment',
'#links' => comment_links($comment, $node),
'#attributes' => array('class' => array('links', 'inline')),
);
Index: modules/contextual/contextual.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/contextual/contextual.module,v
retrieving revision 1.3
diff -u -p -r1.3 contextual.module
--- modules/contextual/contextual.module 21 Dec 2009 13:47:32 -0000 1.3
+++ modules/contextual/contextual.module 3 Jan 2010 02:22:25 -0000
@@ -149,7 +149,7 @@ function contextual_links_view($element)
$build = array(
'#prefix' => '
',
'#suffix' => '
',
- '#theme' => 'links',
+ '#theme' => 'links__contextual',
'#links' => $links,
'#attributes' => array('class' => array('contextual-links')),
'#attached' => array(
Index: modules/locale/locale.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/locale/locale.module,v
retrieving revision 1.276
diff -u -p -r1.276 locale.module
--- modules/locale/locale.module 23 Dec 2009 13:28:45 -0000 1.276
+++ modules/locale/locale.module 3 Jan 2010 02:22:26 -0000
@@ -894,7 +894,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('links__locale_block', $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.82
diff -u -p -r1.82 node.admin.inc
--- modules/node/node.admin.inc 4 Dec 2009 16:49:46 -0000 1.82
+++ modules/node/node.admin.inc 3 Jan 2010 02:22:26 -0000
@@ -517,7 +517,7 @@ function node_admin_nodes() {
// Render an unordered list of operations links.
$options[$node->nid]['operations'] = array(
'data' => array(
- '#theme' => 'links',
+ '#theme' => 'links__node_operations',
'#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.1193
diff -u -p -r1.1193 node.module
--- modules/node/node.module 31 Dec 2009 08:26:59 -0000 1.1193
+++ modules/node/node.module 3 Jan 2010 02:22:26 -0000
@@ -1253,7 +1253,7 @@ function node_build_content($node, $view
);
}
$node->content['links']['node'] = array(
- '#theme' => 'links',
+ '#theme' => 'links__node',
'#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.332
diff -u -p -r1.332 poll.module
--- modules/poll/poll.module 2 Jan 2010 23:30:53 -0000 1.332
+++ modules/poll/poll.module 3 Jan 2010 02:22:26 -0000
@@ -819,7 +819,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('links__poll_results', 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.329
diff -u -p -r1.329 statistics.module
--- modules/statistics/statistics.module 26 Dec 2009 16:50:09 -0000 1.329
+++ modules/statistics/statistics.module 3 Jan 2010 02:22:26 -0000
@@ -117,7 +117,7 @@ function statistics_node_view($node, $vi
}
$node->content['links']['statistics'] = array(
- '#theme' => 'links',
+ '#theme' => 'links__statistics_node',
'#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.40
diff -u -p -r1.40 page.tpl.php
--- modules/system/page.tpl.php 18 Dec 2009 15:44:02 -0000 1.40
+++ modules/system/page.tpl.php 3 Jan 2010 02:22:26 -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/toolbar/toolbar.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/toolbar/toolbar.module,v
retrieving revision 1.30
diff -u -p -r1.30 toolbar.module
--- modules/toolbar/toolbar.module 21 Dec 2009 13:47:32 -0000 1.30
+++ modules/toolbar/toolbar.module 3 Jan 2010 02:22:27 -0000
@@ -191,7 +191,7 @@ function toolbar_view() {
$links = toolbar_menu_navigation_links(toolbar_get_menu_tree());
$system_menus = menu_list_system_menus();
$build['toolbar_menu'] = array(
- '#theme' => 'links',
+ '#theme' => 'links__toolbar_menu',
'#links' => $links,
'#attributes' => array('id' => 'toolbar-menu'),
'#heading' => array('text' => t($system_menus['management']), 'level' => 'h2', 'class' => 'element-invisible'),
@@ -220,7 +220,7 @@ function toolbar_view() {
);
}
$build['toolbar_user'] = array(
- '#theme' => 'links',
+ '#theme' => 'links__toolbar_user',
'#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.70
diff -u -p -r1.70 translation.module
--- modules/translation/translation.module 29 Dec 2009 04:23:53 -0000 1.70
+++ modules/translation/translation.module 3 Jan 2010 02:22:27 -0000
@@ -188,7 +188,7 @@ function translation_node_view($node, $v
// Do not show link to the same node.
unset($links[$node->language]);
$node->content['links']['translation'] = array(
- '#theme' => 'links',
+ '#theme' => 'links__translation_node',
'#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.28
diff -u -p -r1.28 update.report.inc
--- modules/update/update.report.inc 22 Dec 2009 14:47:14 -0000 1.28
+++ modules/update/update.report.inc 3 Jan 2010 02:22:27 -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('links__update_version', array('links' => $links));
$output .= '';
$output .= '';
$output .= "\n";
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 3 Jan 2010 02:22:27 -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('links__system_main_menu', 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('links__system_secondary_menu', array(
'links' => $vars['secondary_menu'],
'attributes' => array(
'class' => array('links', 'secondary-menu'),