Index: token_node.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/token/token_node.inc,v
retrieving revision 1.3.2.18
diff -u -p -r1.3.2.18 token_node.inc
--- token_node.inc	17 Oct 2007 15:50:42 -0000	1.3.2.18
+++ token_node.inc	5 Jan 2008 06:13:06 -0000
@@ -20,33 +20,33 @@ function node_token_values($type, $objec
       $values['author-name']      = check_plain($node->name);
       $values['author-name-raw']  = $node->name;
       if (isset($node->created)) {
-	$values['yyyy']           = date('Y', $node->created);
-	$values['yy']             = date('y', $node->created);
-	$values['month']          = date('F', $node->created);
-	$values['mon']            = date('M', $node->created);
-	$values['mm']             = date('m', $node->created);
-	$values['m']              = date('n', $node->created);
-	$values['ww']             = date('W', $node->created);
-	$values['date']           = date('N', $node->created);
-	$values['day']            = date('l', $node->created);
-	$values['ddd']            = date('D', $node->created);
-	$values['dd']             = date('d', $node->created);
-	$values['d']              = date('j', $node->created);
+	$values['yyyy']           = format_date($node->created, 'custom', 'Y');
+	$values['yy']             = format_date($node->created, 'custom', 'y');
+	$values['month']          = format_date($node->created, 'custom', 'F');
+	$values['mon']            = format_date($node->created, 'custom', 'M');
+	$values['mm']             = format_date($node->created, 'custom', 'm');
+	$values['m']              = format_date($node->created, 'custom', 'n');
+	$values['ww']             = format_date($node->created, 'custom', 'W');
+	$values['date']           = format_date($node->created, 'custom', 'N');
+	$values['day']            = format_date($node->created, 'custom', 'l');
+	$values['ddd']            = format_date($node->created, 'custom', 'D');
+	$values['dd']             = format_date($node->created, 'custom', 'd');
+	$values['d']              = format_date($node->created, 'custom', 'j');
       }
 
       if (isset($node->changed)) {
-	$values['mod-yyyy']       = date('Y', $node->changed);
-	$values['mod-yy']         = date('y', $node->changed);
-	$values['mod-month']      = date('F', $node->changed);
-	$values['mod-mon']        = date('M', $node->changed);
-	$values['mod-mm']         = date('m', $node->changed);
-	$values['mod-m']          = date('n', $node->changed);
-	$values['mod-ww']         = date('W', $node->changed);
-	$values['mod-date']       = date('N', $node->changed);
-	$values['mod-day']        = date('l', $node->changed);
-	$values['mod-ddd']        = date('D', $node->changed);
-	$values['mod-dd']         = date('d', $node->changed);
-	$values['mod-d']          = date('j', $node->changed);
+	$values['mod-yyyy']       = format_date($node->changed, 'custom', 'Y');
+	$values['mod-yy']         = format_date($node->changed, 'custom', 'y');
+	$values['mod-month']      = format_date($node->changed, 'custom', 'F');
+	$values['mod-mon']        = format_date($node->changed, 'custom', 'M');
+	$values['mod-mm']         = format_date($node->changed, 'custom', 'm');
+	$values['mod-m']          = format_date($node->changed, 'custom', 'n');
+	$values['mod-ww']         = format_date($node->changed, 'custom', 'W');
+	$values['mod-date']       = format_date($node->changed, 'custom', 'N');
+	$values['mod-day']        = format_date($node->changed, 'custom', 'l');
+	$values['mod-ddd']        = format_date($node->changed, 'custom', 'D');
+	$values['mod-dd']         = format_date($node->changed, 'custom', 'd');
+	$values['mod-d']          = format_date($node->changed, 'custom', 'j');
       }
       
       // Now get the menu related information.