From 128cc45ac3b59116c7ba2843ceb706a9416df4bf Mon Sep 17 00:00:00 2001
From: Islandora <islandora@Islandora.(none)>
Date: Wed, 10 Apr 2013 14:31:25 -0300
Subject: [PATCH] Updated comments in islandora_prepare_new_object() function.

---
 includes/utilities.inc | 15 +++++++++------
 islandora.module       |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/includes/utilities.inc b/includes/utilities.inc
index 05c5320f..27c53150 100644
--- a/includes/utilities.inc
+++ b/includes/utilities.inc
@@ -485,12 +485,15 @@ function islandora_prepare_new_object($namespace = NULL, $label = NULL, $datastr
         $as_file = TRUE;
       }
       else {
-        // XXX: Dunno... No promises? Let's try to make a URL out of whatever
-        // this is.
+        // Schema does not match available php stream wrapper. Attempt to
+        // set datastream_file by url for the given scheme. Https (SSL) can 
+        // cause this to fail, and trigger an output log in watchdog.
         $datastream_file = url($ds['datastream_file'], array('absolute' => TRUE));
-        watchdog('islandora', 'Attempting to ingest %file in islandora_prepare_new_object(), but it does not appear to be readable. We will pass the path through url(), and pass along as such.', array(
-            '%file' => $datastream_file,
-          ), WATCHDOG_WARNING);
+        watchdog('islandora', 'Attempting to ingest %file in islandora_prepare_new_object(), ' . 
+                              ' but it does not appear to be readable. We will pass the path through' . 
+                              ' url(), and pass along as such.', 
+                              array('%file' => $datastream_file, ) , 
+                              WATCHDOG_WARNING);
       }
     }
 
@@ -529,7 +532,7 @@ function islandora_display_repository_inaccessible_message() {
   $link = l($text, 'admin/islandora/configure', array('attributes' => array('title' => $text)));
   $message = t('Could not connect to the repository. Please check the settings on the !link page.',
              array('!link' => $link));
-  drupal_set_message($message, 'error', FALSE);
+  drupal_set_message(check_plain($message), 'error', FALSE);
 }
 
 /**
diff --git a/islandora.module b/islandora.module
index 981189bc..e54fe0d6 100644
--- a/islandora.module
+++ b/islandora.module
@@ -964,7 +964,7 @@ function islandora_delete_object(FedoraObject &$object) {
     $object = NULL;
     return TRUE;
   }
-  catch(Exception $e) {
+  catch (Exception $e) {
     // Exception message gets logged in Tuque Wrapper.
     return FALSE;
   }