From fa912f720e074ced2ba92e16276379dbaff86c24 Mon Sep 17 00:00:00 2001 From: ajstanley Date: Thu, 9 Aug 2018 20:42:23 -0300 Subject: [PATCH] the filtering was getting out of hand --- includes/derivatives.inc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/includes/derivatives.inc b/includes/derivatives.inc index c93f692e..aca79bea 100644 --- a/includes/derivatives.inc +++ b/includes/derivatives.inc @@ -128,8 +128,8 @@ function islandora_do_derivatives(AbstractObject $object, array $options) { */ function islandora_derivative_logging(array $logging_results) { $result_messages = array( - 'success' => t('Derivatives successfully created.'), - 'incomplete' => t('Not all derivatives successfully created. Please check log messages'), + 'success' => l(t('Derivatives successfully created'), 'islandora/event-status'), + 'incomplete' => l(t('Not all derivatives successfully created. Please check log messages'), 'islandora/event-status'), ); foreach ($logging_results as $result) { foreach ($result['messages'] as $message) { @@ -158,7 +158,8 @@ function islandora_derivative_logging(array $logging_results) { $result_message = $result_messages['incomplete']; $message_status = 'warning'; } - drupal_set_message(l(filter_xss($result_message), 'islandora/event-status'), filter_xss($message_status), FALSE); + drupal_set_message(filter_xss($result_message), filter_xss($message_status), FALSE); + if (isset($_SESSION['messages']['warning']) && isset($_SESSION['messages']['status'])) { unset($_SESSION['messages']['status']); }