Merge pull request #102 from ppound/ISLANDORA-596

fixes for tickets ISLANDORA-596 and ISLANDORA-597

CollectionClass.inc

@@ -687,6 +687,9 @@ class CollectionClass {
     global $base_url;
     $collection_pid = $pid; //we will be changing the pid later maybe
     $parsedContent = NULL;
+    if(!isset($this->collectionObject)){
+      $this->collectionObject = new ObjectHelper($pid);
+    } 
     $contentModels = $this->collectionObject->get_content_models_list($pid);
     $isCollection = FALSE;
     //if this is a collection object store the $pid in the session as it will come in handy

plugins/tagging_form.inc

@@ -61,7 +61,7 @@ function fedora_repository_image_tagging_form($form_state, $pid) {
   $tagset = new TagSet($obj);
   $tags = array();
   foreach ($tagset->tags as $tag) {
-    $form_tag =& $form['tags-wrapper']['tags'][$tag['name']] = array(
+    $form_tag = $form['tags-wrapper']['tags'][$tag['name']] = array(
       '#prefix' => '<li>',
       '#suffix' => '</li>',
     );
@@ -69,7 +69,7 @@ function fedora_repository_image_tagging_form($form_state, $pid) {
     $tag_title_text = t('Added by @creator.', array(
       '@creator' => $tag['creator'],
     ));
-    $tag_mnpl_search_path = "fedora/repository/mnpl_advanced_search/tag:{$tag['name']}"
+    $tag_mnpl_search_path = "fedora/repository/mnpl_advanced_search/tag:{$tag['name']}";
     $form_tag['tag'] = array(
       '#value' => l($tag['name'], $tag_mnpl_search_path, array('attributes' => array(
         'title' => $tag_title_text