Merge pull request #138 from adam-vessey/6.x

6.x

CollectionClass.inc

@@ -533,16 +533,12 @@ class CollectionClass {
   function showFieldSets($page_number) {
     module_load_include('inc', 'fedora_repository', 'api/fedora_item');
     module_load_include('inc', 'fedora_repository', 'CollectionPolicy');
-    //module_load_include('inc', 'fedora_repository', 'BatchIngest'); //Legacy code?
     global $base_url;
     global $user;
     
     $tabset = array();
-    $query = NULL;
+    $query = self::getCollectionQuery($this->pid);
     $item = new Fedora_Item($this->pid);
-    if ($item->exists() && array_key_exists('QUERY', $item->datastreams)) {
-      $query = $item->get_datastream_dissemination('QUERY');
-    }
     $results = $this->getRelatedItems($this->pid, $query);
 
     $collection_items = $this->renderCollection($results, $this->pid, NULL, NULL, $page_number);

fedora_repository.module

@@ -917,7 +917,7 @@ function makeObject($pid, $dsID) {
     drupal_set_message(t("No pid or dsid given to create an object with."));
     return ' ';
   }
-  global $user;
+  global $user, $conf;
   if (!fedora_repository_access(OBJECTHELPER :: $OBJECT_HELPER_VIEW_FEDORA, $pid, $user)) {
     drupal_access_denied();
     return;
@@ -925,6 +925,9 @@ function makeObject($pid, $dsID) {
     return ' ';
   }
 
+  //Disable the page cache, so entire datastreams do not get thrown into the page cache.
+  $conf['cache'] = CACHE_DISABLED;
+
   module_load_include('inc', 'fedora_repository', 'ObjectHelper');
   $objectHelper = new ObjectHelper();
   $objectHelper->makeObject($pid, $dsID);