#364470 by stBorchert and JohnAlbin: Made theming of 'Submitted by author, on date' easier.

3 files changed, 13 insertions, 25 deletions

diff --git a/modules/node/node.module b/modules/node/node.module
index 1218b9d32..0561adb20 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -128,9 +128,6 @@ function node_theme() {
     'node_log_message' => array(
       'arguments' => array('log' => NULL),
     ),
-    'node_submitted' => array(
-      'arguments' => array('node' => NULL),
-    ),
     'node_admin_overview' => array(
       'arguments' => array('name' => NULL, 'type' => NULL),
     ),
@@ -1142,11 +1139,11 @@ function template_preprocess_node(&$variables) {
 
   // Display post information only on certain node types.
   if (variable_get('node_submitted_' . $node->type, TRUE)) {
-    $variables['submitted'] = theme('node_submitted', $node);
+    $variables['display_submitted'] = TRUE;
     $variables['user_picture'] = theme_get_setting('toggle_node_user_picture') ? theme('user_picture', $node) : '';
   }
   else {
-    $variables['submitted'] = '';
+    $variables['display_submitted'] = FALSE;
     $variables['user_picture'] = '';
   }
 
@@ -2808,19 +2805,6 @@ function node_forms() {
 }
 
 /**
- * Format the "Submitted by username on date/time" for each node
- *
- * @ingroup themeable
- */
-function theme_node_submitted($node) {
-  return t('Submitted by !username on @datetime',
-    array(
-      '!username' => theme('username', $node),
-      '@datetime' => format_date($node->created),
-    ));
-}
-
-/**
  * Implement hook_hook_info().
  */
 function node_hook_info() {
diff --git a/modules/node/node.test b/modules/node/node.test
index 389494b57..0de3355ca 100644
--- a/modules/node/node.test
+++ b/modules/node/node.test
@@ -533,7 +533,7 @@ class NodePostSettingsTestCase extends DrupalWebTestCase {
 
     // Check that the post information is displayed.
     $node = $this->drupalGetNodeByTitle($edit['title']);
-    $this->assertRaw(theme('node_submitted', $node), t('Post information is displayed.'));
+    $this->assertRaw('<span class="submitted">', t('Post information is displayed.'));
   }
 
   /**
@@ -555,7 +555,7 @@ class NodePostSettingsTestCase extends DrupalWebTestCase {
 
     // Check that the post information is displayed.
     $node = $this->drupalGetNodeByTitle($edit['title']);
-    $this->assertNoRaw(theme('node_submitted', $node), t('Post information is not displayed.'));
+    $this->assertNoRaw('<span class="submitted">', t('Post information is not displayed.'));
   }
 }
 
diff --git a/modules/node/node.tpl.php b/modules/node/node.tpl.php
index 6ca204a5d..c3aa23539 100644
--- a/modules/node/node.tpl.php
+++ b/modules/node/node.tpl.php
@@ -17,8 +17,7 @@
  * - $name: Themed username of node author output from theme_username().
  * - $node_url: Direct url of the current node.
  * - $terms: the themed list of taxonomy term links output from theme_links().
- * - $submitted: themed submission information output from
- *   theme_node_submitted().
+ * - $display_submitted: whether submission information should be displayed.
  * - $classes: String of classes that can be used to style contextually through
  *   CSS. It can be manipulated through the variable $classes_array from
  *   preprocess functions. The default values can be one or more of the following:
@@ -79,10 +78,15 @@
     <h2><a href="<?php print $node_url; ?>"><?php print $title; ?></a></h2>
   <?php endif; ?>
 
-  <?php if ($submitted || !empty($content['links']['terms'])): ?>
+  <?php if ($display_submitted || !empty($content['links']['terms'])): ?>
     <div class="meta">
-      <?php if ($submitted): ?>
-        <span class="submitted"><?php print $submitted; ?></span>
+      <?php if ($display_submitted): ?>
+        <span class="submitted">
+          <?php
+            print t('Submitted by !username on @datetime',
+              array('!username' => $name, '@datetime' => $date));
+          ?>
+        </span>
       <?php endif; ?>
 
       <?php if (!empty($content['links']['terms'])): ?>