From 69010df8ea04d8c895b27363cbdab3970a7246c1 Mon Sep 17 00:00:00 2001
From: Jordan Dukart <jordan@discoverygarden.ca>
Date: Wed, 7 Aug 2013 19:06:09 +0000
Subject: [PATCH] Filter xssing too much, minor doc fixes.

---
 includes/derivatives.inc                | 2 +-
 islandora.api.php                       | 4 +++-
 tests/islandora_derivatives_test.module | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/includes/derivatives.inc b/includes/derivatives.inc
index f5058588..f707f88a 100644
--- a/includes/derivatives.inc
+++ b/includes/derivatives.inc
@@ -91,7 +91,7 @@ function islandora_derivative_logging(array $logging_results) {
   foreach ($logging_results as $result) {
     foreach ($result['messages'] as $message) {
       if ($message['type'] === 'dsm') {
-        drupal_set_message(filter_xss(format_string($message['message'], isset($message['message_sub']) ? $message['message_sub'] : array()), isset($message['severity']) ? $message['severity'] : 'status'));
+        drupal_set_message(filter_xss(format_string($message['message'], isset($message['message_sub']) ? $message['message_sub'] : array())), isset($message['severity']) ? $message['severity'] : 'status');
       }
       else {
         watchdog('islandora', $message['message'], isset($message['message_sub']) ? $message['message_sub'] : array(), isset($message['severity']) ? $message['severity'] : WATCHDOG_NOTICE);
diff --git a/islandora.api.php b/islandora.api.php
index 74bdef81..da6dae77 100644
--- a/islandora.api.php
+++ b/islandora.api.php
@@ -553,6 +553,8 @@ function hook_CMODEL_PID_islandora_datastream_access($op, $object, $user) {
  *       - severity: (Optional) A severity level / status to be used when
  *         logging messages. Uses the defaults of drupal_set_message and
  *         watchdog if not defined.
+ *   - file: A string denoting the path to the file where the function
+ *     is being called from.
  */
 function hook_islandora_derivative() {
   return array(
@@ -590,4 +592,4 @@ function hook_islandora_derivative() {
  */
 function hook_CMODEL_PID_islandora_derivative() {
 
-}
\ No newline at end of file
+}
diff --git a/tests/islandora_derivatives_test.module b/tests/islandora_derivatives_test.module
index 71e043f0..80530296 100644
--- a/tests/islandora_derivatives_test.module
+++ b/tests/islandora_derivatives_test.module
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_islandora_CMODEL_derivative().
+ * Implements hook_islandora_CMODEL_PID_derivative().
  */
 function islandora_derivatives_test_some_cmodel_islandora_derivative() {
   return array(
@@ -146,7 +146,7 @@ function islandora_derivatives_test_create_nosource_datastream(AbstractObject $o
  *   The datastream id for which we are adding/modifying.
  * @param string $deriv_string
  *   The content of the datastream we are adding.
- * 
+ *
  * @return bool|string
  *   A bool if the operation was successfully, the error message otherwise.
  */