Index: token_comment.inc =================================================================== RCS file: /cvs/drupal/contributions/modules/token/Attic/token_comment.inc,v retrieving revision 1.3.4.5 diff -u -r1.3.4.5 token_comment.inc --- token_comment.inc 31 May 2009 15:56:09 -0000 1.3.4.5 +++ token_comment.inc 3 Jul 2009 10:57:06 -0000 @@ -54,14 +54,17 @@ $values['comment-yyyy'] = date('Y', $comment->timestamp); $values['comment-yy'] = date('y', $comment->timestamp); - $values['comment-month'] = date('F', $comment->timestamp); - $values['comment-mon'] = date('M', $comment->timestamp); + $values['comment-month'] = format_date($comment->timestamp, 'custom', 'F'); + $values['comment-mon'] = format_date($comment->timestamp, 'custom', 'M'); $values['comment-mm'] = date('m', $comment->timestamp); $values['comment-m'] = date('n', $comment->timestamp); $values['comment-ww'] = date('W', $comment->timestamp); - $values['comment-date'] = date('N', $comment->timestamp); - $values['comment-day'] = date('l', $comment->timestamp); - $values['comment-ddd'] = date('D', $comment->timestamp); + // ISO-8601 numeric representation of the day of the week (added in PHP 5.1.0) + if (version_compare(PHP_VERSION, '5.1.0', '>=') !== FALSE) { + $values['comment-date'] = date('N', $comment->timestamp); + } + $values['comment-day'] = format_date($comment->timestamp, 'custom', 'l'); + $values['comment-ddd'] = format_date($comment->timestamp, 'custom', 'D'); $values['comment-dd'] = date('d', $comment->timestamp); $values['comment-d'] = date('j', $comment->timestamp); break; @@ -97,7 +100,10 @@ $tokens['comment']['comment-mm'] = t("Comment creation month (two digit, zero padded)"); $tokens['comment']['comment-m'] = t("Comment creation month (one or two digit)"); $tokens['comment']['comment-ww'] = t("Comment creation week (two digit)"); - $tokens['comment']['comment-date'] = t("Comment creation 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', '>=') !== FALSE) { + $tokens['comment']['comment-date'] = t("Comment creation date (day of the week)"); + } $tokens['comment']['comment-day'] = t("Comment creation day (full word)"); $tokens['comment']['comment-ddd'] = t("Comment creation day (abbreviation)"); $tokens['comment']['comment-dd'] = t("Comment creation day (two digit, zero-padded)"); Index: token_user.inc =================================================================== RCS file: /cvs/drupal/contributions/modules/token/Attic/token_user.inc,v retrieving revision 1.3.4.2 diff -u -r1.3.4.2 token_user.inc --- token_user.inc 28 Jun 2008 15:10:22 -0000 1.3.4.2 +++ token_user.inc 3 Jul 2009 10:57:07 -0000 @@ -30,7 +30,7 @@ } $values['user'] = $account->uid ? check_plain($account->name) : variable_get('anonymous', 'Anonymous'); - $values['user-raw'] = $account->uid ? $account->name : variable_get('anonymous', 'Anonymous'); + $values['user-raw'] = $account->uid ? $account->name : variable_get('anonymous', 'Anonymous'); $values['uid'] = $account->uid; $values['mail'] = $account->uid ? $account->mail : ''; $values['reg-date'] = $account->uid ? format_date($account->created, 'short') : ''; @@ -52,7 +52,7 @@ function user_token_list($type = 'all') { if ($type == 'user' || $type == 'all') { $tokens['user']['user'] = t("User's name"); - $tokens['user']['user-raw'] = t("User's unfiltered name. WARNING - raw user input."); + $tokens['user']['user-raw'] = t("User's unfiltered name. WARNING - raw user input."); $tokens['user']['uid'] = t("User's ID"); $tokens['user']['mail'] = t("User's email address"); Index: token_node.inc =================================================================== RCS file: /cvs/drupal/contributions/modules/token/Attic/token_node.inc,v retrieving revision 1.5.4.14 diff -u -r1.5.4.14 token_node.inc --- token_node.inc 14 May 2009 16:09:15 -0000 1.5.4.14 +++ token_node.inc 3 Jul 2009 10:57:07 -0000 @@ -39,14 +39,17 @@ $date = (int)$node->created; $values['yyyy'] = date('Y', $date); $values['yy'] = date('y', $date); - $values['month'] = date('F', $date); - $values['mon'] = date('M', $date); + $values['month'] = format_date($date, 'custom', 'F'); + $values['mon'] = format_date($date, 'custom', 'M'); $values['mm'] = date('m', $date); $values['m'] = date('n', $date); $values['ww'] = date('W', $date); - $values['date'] = date('N', $date); - $values['day'] = date('l', $date); - $values['ddd'] = date('D', $date); + // ISO-8601 numeric representation of the day of the week (added in PHP 5.1.0) + if (version_compare(PHP_VERSION, '5.1.0', '>=') !== FALSE) { + $values['date'] = date('N', $date); + } + $values['day'] = format_date($date, 'custom', 'l'); + $values['ddd'] = format_date($date, 'custom', 'D'); $values['dd'] = date('d', $date); $values['d'] = date('j', $date); } @@ -55,14 +58,17 @@ $date = (int)$node->changed; $values['mod-yyyy'] = date('Y', $date); $values['mod-yy'] = date('y', $date); - $values['mod-month'] = date('F', $date); - $values['mod-mon'] = date('M', $date); + $values['mod-month'] = format_date($date, 'custom', 'F'); + $values['mod-mon'] = format_date($date, 'custom', 'M'); $values['mod-mm'] = date('m', $date); $values['mod-m'] = date('n', $date); $values['mod-ww'] = date('W', $date); - $values['mod-date'] = date('N', $date); - $values['mod-day'] = date('l', $date); - $values['mod-ddd'] = date('D', $date); + // ISO-8601 numeric representation of the day of the week (added in PHP 5.1.0) + if (version_compare(PHP_VERSION, '5.1.0', '>=') !== FALSE) { + $values['mod-date'] = date('N', $date); + } + $values['mod-day'] = format_date($date, 'custom', 'l'); + $values['mod-ddd'] = format_date($date, 'custom', 'D'); $values['mod-dd'] = date('d', $date); $values['mod-d'] = date('j', $date); } @@ -201,7 +207,10 @@ $tokens['node']['mm'] = t("Node creation month (two digit, zero padded)"); $tokens['node']['m'] = t("Node creation month (one or two digit)"); $tokens['node']['ww'] = t("Node creation week (two digit)"); - $tokens['node']['date'] = t("Node creation 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', '>=') !== FALSE) { + $tokens['node']['date'] = t("Node creation date (day of month)"); + } $tokens['node']['day'] = t("Node creation day (full word)"); $tokens['node']['ddd'] = t("Node creation day (abbreviation)"); $tokens['node']['dd'] = t("Node creation day (two digit, zero-padded)");