Browse Source

Filter xssing too much, minor doc fixes.

pull/380/head
Jordan Dukart 12 years ago
parent
commit
69010df8ea
  1. 2
      includes/derivatives.inc
  2. 4
      islandora.api.php
  3. 4
      tests/islandora_derivatives_test.module

2
includes/derivatives.inc

@ -91,7 +91,7 @@ function islandora_derivative_logging(array $logging_results) {
foreach ($logging_results as $result) { foreach ($logging_results as $result) {
foreach ($result['messages'] as $message) { foreach ($result['messages'] as $message) {
if ($message['type'] === 'dsm') { 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 { else {
watchdog('islandora', $message['message'], isset($message['message_sub']) ? $message['message_sub'] : array(), isset($message['severity']) ? $message['severity'] : WATCHDOG_NOTICE); watchdog('islandora', $message['message'], isset($message['message_sub']) ? $message['message_sub'] : array(), isset($message['severity']) ? $message['severity'] : WATCHDOG_NOTICE);

4
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 * - severity: (Optional) A severity level / status to be used when
* logging messages. Uses the defaults of drupal_set_message and * logging messages. Uses the defaults of drupal_set_message and
* watchdog if not defined. * watchdog if not defined.
* - file: A string denoting the path to the file where the function
* is being called from.
*/ */
function hook_islandora_derivative() { function hook_islandora_derivative() {
return array( return array(
@ -590,4 +592,4 @@ function hook_islandora_derivative() {
*/ */
function hook_CMODEL_PID_islandora_derivative() { function hook_CMODEL_PID_islandora_derivative() {
} }

4
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() { function islandora_derivatives_test_some_cmodel_islandora_derivative() {
return array( return array(
@ -146,7 +146,7 @@ function islandora_derivatives_test_create_nosource_datastream(AbstractObject $o
* The datastream id for which we are adding/modifying. * The datastream id for which we are adding/modifying.
* @param string $deriv_string * @param string $deriv_string
* The content of the datastream we are adding. * The content of the datastream we are adding.
* *
* @return bool|string * @return bool|string
* A bool if the operation was successfully, the error message otherwise. * A bool if the operation was successfully, the error message otherwise.
*/ */

Loading…
Cancel
Save