Project

General

Profile

Revision 4cfd8be6

Added by Assos Assos over 9 years ago

Weekly update of contrib modules

View differences:

drupal7/sites/all/modules/token/token.pages.inc
19 19 
  }
20 20 

  		




  21
  21
  
    
  $info = token_theme();


  		




  22
  
  
    
  $variables['options']['query']['options'] = array_intersect_key($variables, $info['token_tree']['variables']);


  		




  
  22
  
    
  $tree_variables = array_intersect_key($variables, $info['token_tree']['variables']);


  		




  
  23
  
    
  $tree_variables = drupal_array_diff_assoc_recursive($tree_variables, $info['token_tree']['variables']);


  		




  
  24
  
    
  if (!isset($variables['options']['query']['options'])) {


  		




  
  25
  
    
    $variables['options']['query']['options'] = array();


  		




  
  26
  
    
  }


  		




  
  27
  
    
  $variables['options']['query']['options'] += $tree_variables;


  		




  23
  28
  
    

  		




  24
  29
  
    
  // We should never pass the dialog option to theme_token_tree(). It is only


  		




  25
  30
  
    
  // used for this function.


  		












Also available in:  Unified diff