--- views/includes/handlers.inc	2011-11-03 16:48:59.000000000 +0100
+++ views/includes/handlers.inc	2011-11-03 16:46:08.000000000 +0100
@@ -1298,6 +1298,9 @@ class views_join {
     // Tack on the extra.
     if (isset($this->extra)) {
       if (is_array($this->extra)) {
+        // Load query token replacements.
+        $replacements = module_invoke_all('views_query_substitutions', $view);
+
         $extras = array();
         foreach ($this->extra as $info) {
           $extra = '';
@@ -1311,6 +1314,9 @@ class views_join {
             $join_table = $info['table'] . '.';
           }
 
+          // Apply query token replacements.
+          $info['value'] = str_replace(array_keys($replacements), $replacements, $info['value']);
+
           // And now deal with the value and the operator.  Set $q to
           // a single-quote for non-numeric values and the
           // empty-string for numeric values, then wrap all values in $q.