diff --git a/RestConnection.inc b/RestConnection.inc index bd1de7e6..f4671e92 100644 --- a/RestConnection.inc +++ b/RestConnection.inc @@ -41,7 +41,11 @@ class RestConnection { */ public $repository = NULL; - function RestConnection($user) { + function RestConnection($user = NULL) { + if(!isset($user)) { + global $user; + } + if(!isset($user) || $user->uid == 0){ $user_string = 'anonymous'; $pass_string = 'anonymous'; diff --git a/includes/islandora.ingest.inc b/includes/islandora.ingest.inc index 2d61e41e..0aa310a6 100644 --- a/includes/islandora.ingest.inc +++ b/includes/islandora.ingest.inc @@ -12,7 +12,7 @@ function islandora_ingest_get_object($content_models, $collection_pid, $relation global $user; $connection = new RestConnection($user); $object = $connection->repository->constructObject($namespace); - foreach($content_models as $contentmodel) { + foreach($content_models as $content_model) { $object->relationships->add(FEDORA_MODEL_URI, 'hasModel', $content_model); } $object->relationships->add($relationship['uri'], $relationship['value'], $collection_pid); diff --git a/islandora_basic_collection/islandora_basic_collection.module b/islandora_basic_collection/islandora_basic_collection.module index 9e196085..ca76e816 100644 --- a/islandora_basic_collection/islandora_basic_collection.module +++ b/islandora_basic_collection/islandora_basic_collection.module @@ -150,4 +150,4 @@ function islandora_basic_collection_islandora_ingest_get_information($models, $o drupal_set_message(t('Islandora Error getting collection info for %s', array('%s' => $object->id)), 'error'); } } -} +} \ No newline at end of file