? README.html
? taxonomy-v2.patch
Index: acidfree.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/acidfree/acidfree.install,v
retrieving revision 1.28.2.4
diff -w -u -d -r1.28.2.4 acidfree.install
--- acidfree.install	1 Jan 2011 15:28:37 -0000	1.28.2.4
+++ acidfree.install	10 Feb 2011 21:46:29 -0000
@@ -104,4 +104,12 @@
 
     return $ret;
 }
+
+function acidfree_update_6002() {
+  $ret = array();
+  if ($vid = variable_get('acidfree_vocab_id', 0)) {
+    db_query ("UPDATE {vocabulary} SET required='0' WHERE vid='$vid'");
+  }
+  return $ret;
+}
 ?>
Index: acidfree.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/acidfree/acidfree.module,v
retrieving revision 1.147.2.36
diff -w -u -d -r1.147.2.36 acidfree.module
--- acidfree.module	7 Feb 2011 20:44:01 -0000	1.147.2.36
+++ acidfree.module	10 Feb 2011 21:46:30 -0000
@@ -868,6 +868,12 @@
             '#default_value' => variable_get('acidfree_show_quick_links', false),
             '#description' => t('Adds links for adding new items when displaying an album. If you choose to leave this disabled, you can still use the quick items block ') . l('(admin/build/block)','admin/build/block'),
         );
+    $form['album']['acidfree_disable_album_selection'] = array(
+            '#type' => 'checkbox',
+            '#title' => t('Disable album selection for quick links'),
+            '#default_value' => variable_get('acidfree_disable_album_selection', true),
+            '#description' => t('When using the quick links to add images, disable selection of an album. Instead, use the album from which the quick link was used.'),
+        );
     $form['album']['acidfree_show_alternate_view'] = array(
             '#type' => 'checkbox',
             '#title' => t('Show alternative album view'),
@@ -1466,7 +1472,7 @@
                 'relations' => 1,
                 'hierarchy' => 2,
                 'multiple' => 1,
-                'required' => 1,
+                'required' => 0,
                 'tags' => 0,
                 'module' => 'acidfree', // this could allow us to set custom paths
                 'weight' => 0,
Index: types/acidfree_image/acidfree_image.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/acidfree/types/acidfree_image/acidfree_image.module,v
retrieving revision 1.1.2.7
diff -w -u -d -r1.1.2.7 acidfree_image.module
--- types/acidfree_image/acidfree_image.module	1 Feb 2011 18:49:08 -0000	1.1.2.7
+++ types/acidfree_image/acidfree_image.module	10 Feb 2011 21:46:30 -0000
@@ -122,9 +122,18 @@
 
     if (_path_match('node', 'add', 'image', '%d')) {
         $album = acidfree_node_load(arg(3));
+	if (variable_get('acidfree_disable_album_selection', true)) {
+            $term = taxonomy_get_term($album->tid);
+            $form['taxonomy'][$vid] = array(
+                '#type' => 'item',
+                '#title' => t('Album'),
+                '#value' => $term->name,
+            );
+	} else {
         $form['taxonomy'][$vid]['#default_value'] = array($album->tid);
-    }
     _acidfree_filter_taxonomy($form['taxonomy'][$vid]);
+        }
+    }
     $js_attrs = array('onchange' => 'set_title(this.value);');
     $form['image']['#attributes'] = isset($form['image']['#attributes']) ?
         $form['image']['#attributes']+$js_attrs : $js_attrs;