### Eclipse Workspace Patch 1.0
#P token_5
Index: token.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/token/Attic/token.inc,v
retrieving revision 1.1.2.6
diff -u -r1.1.2.6 token.inc
--- token.inc	4 Apr 2007 19:21:04 -0000	1.1.2.6
+++ token.inc	14 Apr 2007 05:04:36 -0000
@@ -97,8 +97,8 @@
   // Flush the static token cache. Useful for processes that need to slog through
   // huge numbers of tokens in a single execution cycle. Flushing it will keep
   // them from burning through memory.
-  if ($flush) {
-    unset($tokens);
+  if ($flush || !isset($tokens)) {
+    $tokens = array();
   }
 
   // Simple recursion check. This is to avoid content_view()'s potential
@@ -124,9 +124,8 @@
   if (module_exists('content')) {
     include_once(drupal_get_path('module', 'token') . '/token_cck.inc');
   }
-
-  if (!isset($tokens)) {
-    $tokens = array();
+  if (module_exists('taxonomy')) {
+    include_once(drupal_get_path('module', 'token') . '/token_taxonomy.inc');
   }
 
   $id = _token_get_id($type, $object);