Merge branch '6.x' of github.com:adam-vessey/islandora into 6.x

CollectionClass.inc

@@ -28,11 +28,9 @@ class CollectionClass {
    * @return CollectionClass
    */
   function __construct($pid = NULL) {
-    if (!empty($pid)) {
+    module_load_include('inc', 'fedora_repository', 'ObjectHelper');
-      module_load_include('inc', 'fedora_repository', 'ObjectHelper');
+    $this->collectionObject = new ObjectHelper();
-      $this->collectionObject = new ObjectHelper($pid);
+    $this->pid = $pid;
-      $this->pid = $pid;
-    }
   }
   
   public static function getCollectionQuery($pid) {

ObjectHelper.inc

@@ -32,8 +32,6 @@ class ObjectHelper {
     drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
     module_load_include('inc', 'fedora_repository', 'ConnectionHelper');
     $connectionHelper = new ConnectionHelper();
-    //$this->fedoraUser = $connectionHelper->getUser();
-    //$this->fedoraPass = $connectionHelper->getPassword();
   }
   
   private static function getBinaryLength($bin) {