Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.1079
diff -u -p -r1.1079 node.module
--- modules/node/node.module	5 Jul 2009 18:00:09 -0000	1.1079
+++ modules/node/node.module	7 Jul 2009 08:13:07 -0000
@@ -1149,8 +1149,9 @@ function node_build_content($node, $buil
     );
   }
   $node->content['links']['node'] = array(
-    '#type' => 'node_links',
-    '#value' => $links
+    '#theme' => 'links',
+    '#links' => $links,
+    '#attributes' => array('class' => 'links inline'),
   );
 
   // Allow modules to make their own additions to the node.
@@ -3131,30 +3132,6 @@ function node_list_permissions($type) {
 }
 
 /**
- * Implement hook_elements().
- */
-function node_elements() {
-  $type['node_links'] = array('#theme' => 'node_links');
-
-  return $type;
-}
-
-/**
- * Format a set of node links.
- *
- * @param $element
- *   An associative array containing the properties of the element.
- *   Properties used:  value
- * @return
- *   A themed HTML string representing the links.
- *
- * @ingroup themeable
- */
-function theme_node_links($element) {
-  return theme('links', $element['#value'],  array('class' => 'links inline'));
-}
-
-/**
  * Implement hook_requirements().
  */
 function node_requirements($phase) {
Index: modules/simpletest/tests/common.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/common.test,v
retrieving revision 1.51
diff -u -p -r1.51 common.test
--- modules/simpletest/tests/common.test	4 Jul 2009 18:26:42 -0000	1.51
+++ modules/simpletest/tests/common.test	7 Jul 2009 08:13:10 -0000
@@ -714,7 +714,7 @@ class DrupalRenderUnitTestCase extends D
     );
     // Test that defaults work.
     $this->assertEqual(drupal_render($element), 'foobar', 'Defaults work');
-    dd(drupal_render($e), 'defaults'); $element = array(
+    $element = array(
       '#theme' => 'common_test_foo',
       '#foo' => $this->randomName(),
       '#bar' => $this->randomName(),