? submitted_by-445744.patch
Index: submitted_by.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/submitted_by/submitted_by.module,v
retrieving revision 1.8
diff -u -p -r1.8 submitted_by.module
--- submitted_by.module	13 May 2009 23:42:54 -0000	1.8
+++ submitted_by.module	24 May 2009 21:19:25 -0000
@@ -30,7 +30,7 @@ function submitted_by_form_alter(&$form,
     case 'node_type_form':
       if (isset($form['comment'])) {
         $form['comment']['comment']['#weight'] = -5;
-        $type = isset($form['identity']['type']) ? $form['identity']['type']['#value'] : '';
+        $type = isset($form['identity']['type']) ? $form['identity']['type']['#default_value'] : '';
         $default = variable_get('submitted_by_comment_'. $type, NULL);
         $form['comment']['appearance'] = array(
           '#type' => 'fieldset',
@@ -48,7 +48,7 @@ function submitted_by_form_alter(&$form,
           );
 
         if ($def_default = variable_get('submitted_by_comment_default', NULL)) {
-          $form['comment']['appearance']['submitted_by']['submitted_by_comment']['#description'] .= ' '. t('The systm default value is "%deflt."', array('%deflt' => $def_default));
+          $form['comment']['appearance']['submitted_by']['submitted_by_comment']['#description'] .= ' '. t('The system default value is "%deflt."', array('%deflt' => $def_default));
         }
 
         $form['comment']['appearance']['submitted_by']['help'] = array(
@@ -154,7 +154,7 @@ function submitted_by_form_node_type_for
     );
 
   if ($def_default = variable_get('submitted_by_default', NULL)) {
-    $form['appearance']['submitted_by']['submitted_by']['#description'] .= ' '. t('The systm default value is "%deflt."', array('%deflt' => $def_default));
+    $form['appearance']['submitted_by']['submitted_by']['#description'] .= ' '. t('The system default value is "%deflt."', array('%deflt' => $def_default));
   }
 
   $form['appearance']['submitted_by']['help'] = array(
@@ -176,7 +176,13 @@ function submitted_by_form_node_type_for
  */
 function submitted_by_comment_submitted($comment) {
   $type = db_result(db_query(db_rewrite_sql("SELECT n.type FROM {node} n WHERE n.nid=%d"), $comment->nid));
-  if ($submitted = variable_get('submitted_by_comment_' . $type, variable_get('submitted_by_comment_default', NULL))) {
+  if(variable_get('submitted_by_comment_' . $type, NULL)) {
+    $submitted = variable_get('submitted_by_comment_' . $type, NULL);
+  }
+  else {
+    $submitted = variable_get('submitted_by_comment_default', NULL);
+  }
+  if ($submitted) {
     return token_replace($submitted, 'comment', $comment);
   }
   else {
@@ -194,7 +200,13 @@ function submitted_by_comment_submitted(
  * varying the results by node type.
  */
 function submitted_by_node_submitted($node) {
-  if ($submitted = variable_get('submitted_by_' . $node->type, variable_get('submitted_by_default', NULL))) {
+  if(variable_get('submitted_by_' . $node->type, NULL)) {
+    $submitted = variable_get('submitted_by_' . $node->type, NULL);
+  }
+  else {
+    $submitted = variable_get('submitted_by_default', NULL);
+  }
+  if ($submitted) {
     return token_replace($submitted, 'node', $node);
   }
   else {
@@ -257,12 +269,15 @@ function submitted_by_token_list($type =
     $tokens['node']['last-edit-mm'] = t('Node last edit month (two digit, zero padded)');
     $tokens['node']['last-edit-m'] = t('Node last edit month (one or two digit)');
     $tokens['node']['last-edit-ww'] = t('Node last edit week (two digit)');
-    $tokens['node']['last-edit-date'] = t('Node last edit date (day of month)');
+    // ISO-8601 numeric representation of the day of the week (added in PHP 5.1.0)
+    if (version_compare(PHP_VERSION, '5.1.0', '>')) {
+      $tokens['node']['last-edit-date'] = t('Node last edit date (day of week)');
+    }
     $tokens['node']['last-edit-day'] = t('Node last edit day (full word)');
     $tokens['node']['last-edit-ddd'] = t('Node last edit day (abbreviation)');
     $tokens['node']['last-edit-dd'] = t('Node last edit day (two digit, zero-padded)');
     $tokens['node']['last-edit-d'] = t('Node last edit day (one or two digit)');
-    $tokens['node']['last-edit-hh'] = t('Node last edit hour (two digit, zero-padded)');
+    $tokens['node']['last-edit-hh'] = t('Node last edit hour in 12-hour format(two digit, zero-padded)');
     $tokens['node']['last-edit-ii'] = t('Node last edit minute (two digit, zero-padded)');
     $tokens['node']['last-edit-ss'] = t('Node last edit second (two digit, zero-padded)');
   }
@@ -270,6 +285,7 @@ function submitted_by_token_list($type =
 }
 
 function _submitted_by_token_date($date, $prefix = NULL) {
+  $date = (int)$date;
   if ($prefix) {
     $prefix .= '-';
   }
@@ -279,24 +295,23 @@ function _submitted_by_token_date($date,
     $prefix .'large'  => format_date($date, 'large'),
     $prefix .'since'  => $date ? format_interval(time() - $date) : t('Never'),
     );
-  $date = (int)$date;
   $values += array(
     $prefix .'yyyy'  => date('Y', $date),
     $prefix .'yy'    => date('y', $date),
-    $prefix .'month' => date('F', $date),
-    $prefix .'mon'   => date('M', $date),
+    $prefix .'month' => format_date($date, 'custom', 'F'),
+    $prefix .'mon'   => format_date($date, 'custom', 'M'),
     $prefix .'mm'    => date('m', $date),
     $prefix .'m'     => date('n', $date),
     $prefix .'ww'    => date('W', $date),
     $prefix .'date'  => date('N', $date),
-    $prefix .'day'   => date('l', $date),
-    $prefix .'ddd'   => date('D', $date),
+    $prefix .'day'   => format_date($date, 'custom', 'l'),
+    $prefix .'ddd'   => format_date($date, 'custom', 'D'),
     $prefix .'dd'    => date('d', $date),
     $prefix .'d'     => date('j', $date),
     $prefix .'hh'    => date('h', $date),
     $prefix .'ii'    => date('i', $date),
-    $prefix .'ss'    => date('d', $date),
+    $prefix .'ss'    => date('s', $date),
     );
 
   return $values;
-}
\ No newline at end of file
+}