*** acidfree_image.module.orig	2011-02-12 13:47:10.000000000 +0100
--- acidfree_image.module	2011-02-13 10:29:35.000000000 +0100
***************
*** 122,132 ****
  
      if (_path_match('node', 'add', 'image', '%d')) {
          $album = acidfree_node_load(arg(3));
-         $form['taxonomy'][$vid]['#default_value'] = array($album->tid);
          _acidfree_filter_taxonomy($form['taxonomy'][$vid]);
! 	    if (variable_get('acidfree_disable_album_selection', true)) {
!             $form['taxonomy'][$vid]['#prefix'] = '<div style="display:none">';
!             $form['taxonomy'][$vid]['#suffix'] = '</div>';
              $term = taxonomy_get_term($album->tid);
              $form['label'] = array(
                  '#type' => 'item',
--- 122,133 ----
  
      if (_path_match('node', 'add', 'image', '%d')) {
          $album = acidfree_node_load(arg(3));
          _acidfree_filter_taxonomy($form['taxonomy'][$vid]);
! 	if (variable_get('acidfree_disable_album_selection', true)) {
!             $form['taxonomy'][$vid] = array(
! 		    '#type' => 'value',
! 		    '#value' => $album->tid,
! 	    );
              $term = taxonomy_get_term($album->tid);
              $form['label'] = array(
                  '#type' => 'item',
***************
*** 136,142 ****
                  '#prefix' => '<div class="container-inline">',
                  '#suffix' => '</div>',
              );
!         }
      }
      $js_attrs = array('onchange' => 'set_title(this.value);');
      $form['image']['#attributes'] = isset($form['image']['#attributes']) ?
--- 137,143 ----
                  '#prefix' => '<div class="container-inline">',
                  '#suffix' => '</div>',
              );
!         } else $form['taxonomy'][$vid]['#default_value'] = array($album->tid);
      }
      $js_attrs = array('onchange' => 'set_title(this.value);');
      $form['image']['#attributes'] = isset($form['image']['#attributes']) ?