Commit f9156219 authored by Russell Blakeborough's avatar Russell Blakeborough
Browse files

Fix merge error undefined variable vocabularies (line 513 of taxonomy_nco_analysis.module)

parent 56e1594b
Loading
Loading
Loading
Loading
+3 −2
Changes for taxonomy_nco_analysis.module: 3 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -488,12 +488,13 @@ function taxonomy_nco_analysis_is_seed($tid) {
 */
function taxonomy_nco_analysis_tids_on_nodes_updated_between($time, $now) {
  // Get tids that may have been updated
  $vocabulary = variable_get('taxonomy_nco_analysis_vocabulary', TAXONOMY_NCO_VOCABULARY);
  // TAXONOMY_NCO_VOCABULARY can now contain multiple values
  // explode should ensure back compatibility
  $vocabularies = explode(',',variable_get('taxonomy_nco_analysis_vocabulary', TAXONOMY_NCO_VOCABULARY));
  if (module_exists('taxonomy_entity_index')) {
  	// note we are using entity index here if we have it to get correct results for tids
  	// that we recalculate, but we will only see tids on updated nodes
  	// todo: ? move over to keeping a table of updated taxonomy?
  	$vocabularies = explode(',',variable_get('taxonomy_nco_analysis_vocabulary', TAXONOMY_NCO_VOCABULARY));
  	$sql = "select ti.tid from {node} n
            join {taxonomy_entity_index} ti on n.nid = ti.entity_id
            join {taxonomy_term_data} td on ti.tid = td.tid