***************
*** 673,678 ****
--- 642,668 ----
    $q = $_GET['q'];
    $nodes_to_check = array();
    switch ($form_id) {
+     case 'image_node_form':
+ 	$vid = acidfree_get_vocab_id();
+ 	if (isset($form['nid']['#value'])) {
+ 	    $nid = $form['nid']['#value'];
+ 	    $tid = db_result (db_query ("SELECT tid FROM {term_node} WHERE nid='$nid'"));
+ 	    if ($tid) {
+ 		if (db_result (db_query ("SELECT tid FROM {acidfree_album} WHERE tid='$tid'"))) {
+ 		    $acidfree_node = TRUE;
+ 		}
+ 	    }
+ 	} else {
+ 	    $pm = _path_match('node', 'add', 'image', '%?d');
+ 	    if ($pm[0]) $aid = $pm[0];
+ 	    if ($aid) {
+ 		if (db_result (db_query ("SELECT aid FROM {acidfree_album} WHERE aid='$aid'"))) {
+ 		    $acidfree_node = TRUE;
+ 		}
+ 	    }
+ 	}
+ 	if (!$acidfree_node) unset ($form['taxonomy'][$vid]);
+ 	break;
      case 'acidfree_node_form':
          _acidfree_node_form_alter($form, $form_state);
          break;