? book_raw_empty_string_205799.patch
? date_migration_206649.patch
Index: token_cck.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/token/token_cck.inc,v
retrieving revision 1.1.2.9
diff -u -p -r1.1.2.9 token_cck.inc
--- token_cck.inc	16 Oct 2007 14:37:59 -0000	1.1.2.9
+++ token_cck.inc	23 Feb 2008 12:10:34 -0000
@@ -222,7 +222,7 @@ if (module_exists('imagefield')) {
 
 
 
-if (module_exists('date')) {
+if (module_exists('date') && !function_exists('date_token_list')) {
   function date_token_list($type = 'all') {
     if ($type == 'field' || $type == 'all') {
       $tokens = array();