? filter_weight-d7.patch
? node-tokens-dsm.patch
? search_theme_form-disable_11.patch
? sites/default/files
? sites/default/private
? sites/default/settings.php
Index: modules/node/node.tokens.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.tokens.inc,v
retrieving revision 1.1
diff -u -p -r1.1 node.tokens.inc
--- modules/node/node.tokens.inc	19 Aug 2009 20:19:36 -0000	1.1
+++ modules/node/node.tokens.inc	23 Aug 2009 12:39:13 -0000
@@ -184,7 +184,6 @@ function node_tokens($type, $tokens, arr
           $replacements[$original] = format_date($node->changed, 'medium', '', NULL, $language_code);
           break;
       }
-    dsm('node');
     }
 
     if ($author_tokens = token_find_with_prefix($tokens, 'author')) {
Index: modules/system/system.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.test,v
retrieving revision 1.70
diff -u -p -r1.70 system.test
--- modules/system/system.test	22 Aug 2009 18:24:14 -0000	1.70
+++ modules/system/system.test	23 Aug 2009 12:39:16 -0000
@@ -1237,13 +1237,11 @@ class TokenReplaceTestCase extends Drupa
     // token, [node:title].
     $this->assertFalse(strcmp($target, $result), t('Basic placeholder tokens replaced.'));
     
-    $raw_tokens = array(
-      'node' => array('title' => '[node:title]'),
-    );
-    $generated = token_generate($raw_tokens, array('node' => $node));
+    $raw_tokens = array('title' => '[node:title]');
+    $generated = token_generate('node', $raw_tokens, array('node' => $node));
     $this->assertFalse(strcmp($generated['[node:title]'], check_plain($node->title)), t('Token sanitized.'));
 
-    $generated = token_generate($raw_tokens, array('node' => $node), array('sanitize' => FALSE));
+    $generated = token_generate('node', $raw_tokens, array('node' => $node), array('sanitize' => FALSE));
     $this->assertFalse(strcmp($generated['[node:title]'], $node->title), t('Unsanitized token generated properly.'));
   }
 }