From 1f6d4f56ffdd09c58d0c6548d4f89e4c6ba1749a Mon Sep 17 00:00:00 2001 From: mitchmac Date: Fri, 18 Oct 2013 12:05:40 -0300 Subject: [PATCH] Rename session array to be more generic --- includes/derivatives.inc | 6 +++--- includes/utilities.inc | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/includes/derivatives.inc b/includes/derivatives.inc index cb8bacbf..4daa2133 100644 --- a/includes/derivatives.inc +++ b/includes/derivatives.inc @@ -100,10 +100,10 @@ function islandora_derivative_logging(array $logging_results) { drupal_set_message(filter_xss(format_string($message['message'], isset($message['message_sub']) ? $message['message_sub'] : array())), $message['severity']); } else { - if (!isset($_SESSION['islandora_derivative_messages'])) { - $_SESSION['islandora_derivative_messages'] = array(); + if (!isset($_SESSION['islandora_event_messages'])) { + $_SESSION['islandora_event_messages'] = array(); } - $_SESSION['islandora_derivative_messages'][] = array( + $_SESSION['islandora_event_messages'][] = array( 'message' => filter_xss(format_string($message['message'], isset($message['message_sub']) ? $message['message_sub'] : array())), 'severity' => 'status', ); diff --git a/includes/utilities.inc b/includes/utilities.inc index 5417100b..44a80402 100644 --- a/includes/utilities.inc +++ b/includes/utilities.inc @@ -933,12 +933,12 @@ function islandora_sanitize_input_for_valid_xml($input, $replacement = '') { */ function islandora_event_status() { $results = FALSE; - if (isset($_SESSION['islandora_derivative_messages'])) { - foreach ($_SESSION['islandora_derivative_messages'] as $message) { + if (isset($_SESSION['islandora_event_messages'])) { + foreach ($_SESSION['islandora_event_messages'] as $message) { drupal_set_message($message['message'], $message['severity']); $results = TRUE; } - unset($_SESSION['islandora_derivative_messages']); + unset($_SESSION['islandora_event_messages']); } $text = ($results) ? t('The status messages above will be deleted after viewing this page.') : t('No messages to display.'); return array('#markup' => $text);