Index: modules/comment/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v
retrieving revision 1.907
diff -u -p -r1.907 comment.module
--- modules/comment/comment.module 23 Oct 2010 15:30:34 -0000 1.907
+++ modules/comment/comment.module 2 Nov 2010 17:25:20 -0000
@@ -2229,6 +2229,7 @@ function template_preprocess_comment(&$v
$variables['title'] = l($comment->subject, $uri['path'], $uri['options']);
$variables['permalink'] = l(t('Permalink'), $uri['path'], $uri['options']);
+ $variables['submitted'] = t('Submitted by !username on !datetime.', array('!username' => $variables['author'], '!datetime' => $variables['created']));
// Preprocess fields.
field_attach_preprocess('comment', $comment, $variables['elements'], $variables);
Index: modules/comment/comment.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.tpl.php,v
retrieving revision 1.18
diff -u -p -r1.18 comment.tpl.php
--- modules/comment/comment.tpl.php 7 Jan 2010 05:23:51 -0000 1.18
+++ modules/comment/comment.tpl.php 2 Nov 2010 17:25:20 -0000
@@ -19,6 +19,7 @@
* desired parameters on the $comment->changed variable.
* - $new: New comment marker.
* - $permalink: Comment permalink.
+ * - $submitted: Themed submission information.
* - $picture: Authors picture.
* - $signature: Authors signature.
* - $status: Comment status. Possible values are:
@@ -70,8 +71,8 @@
$author, '!datetime' => $created));
+ if ($submitted):
+ print $submitted;
?>
Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.1312
diff -u -p -r1.1312 node.module
--- modules/node/node.module 23 Oct 2010 18:25:05 -0000 1.1312
+++ modules/node/node.module 2 Nov 2010 17:25:20 -0000
@@ -1426,11 +1426,11 @@ function template_preprocess_node(&$vari
// Display post information only on certain node types.
if (variable_get('node_submitted_' . $node->type, TRUE)) {
- $variables['display_submitted'] = TRUE;
+ $variables['submitted'] = t('Submitted by !username on !datetime', array('!username' => $variables['name'], '!datetime' => $variables['date']));
$variables['user_picture'] = theme_get_setting('toggle_node_user_picture') ? theme('user_picture', array('account' => $node)) : '';
}
else {
- $variables['display_submitted'] = FALSE;
+ $variables['submitted'] = FALSE;
$variables['user_picture'] = '';
}
Index: modules/node/node.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.tpl.php,v
retrieving revision 1.33
diff -u -p -r1.33 node.tpl.php
--- modules/node/node.tpl.php 8 Apr 2010 18:26:42 -0000 1.33
+++ modules/node/node.tpl.php 2 Nov 2010 17:25:20 -0000
@@ -16,7 +16,7 @@
* calling format_date() with the desired parameters on the $created variable.
* - $name: Themed username of node author output from theme_username().
* - $node_url: Direct url of the current node.
- * - $display_submitted: whether submission information should be displayed.
+ * - $submitted: Themed submission information.
* - $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
@@ -87,12 +87,9 @@
-
+
- $name, '!datetime' => $date));
- ?>
+
Index: themes/bartik/templates/node.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/bartik/templates/node.tpl.php,v
retrieving revision 1.1
diff -u -p -r1.1 node.tpl.php
--- themes/bartik/templates/node.tpl.php 6 Jul 2010 05:25:51 -0000 1.1
+++ themes/bartik/templates/node.tpl.php 2 Nov 2010 17:25:20 -0000
@@ -16,7 +16,7 @@
* calling format_date() with the desired parameters on the $created variable.
* - $name: Themed username of node author output from theme_username().
* - $node_url: Direct url of the current node.
- * - $display_submitted: whether submission information should be displayed.
+ * - $submitted: Themed submission information.
* - $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
@@ -87,13 +87,10 @@
-
+
- $name, '!datetime' => $date));
- ?>
+
Index: themes/garland/comment.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/comment.tpl.php,v
retrieving revision 1.20
diff -u -p -r1.20 comment.tpl.php
--- themes/garland/comment.tpl.php 4 Jan 2010 03:57:19 -0000 1.20
+++ themes/garland/comment.tpl.php 2 Nov 2010 17:25:20 -0000
@@ -5,7 +5,9 @@
-
—
+
+
+
Index: themes/garland/node.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/node.tpl.php,v
retrieving revision 1.23
diff -u -p -r1.23 node.tpl.php
--- themes/garland/node.tpl.php 8 Apr 2010 18:26:42 -0000 1.23
+++ themes/garland/node.tpl.php 2 Nov 2010 17:25:20 -0000
@@ -11,8 +11,8 @@
-
-
—
+
+
>