diff --git a/modules/dblog/dblog.admin.inc b/modules/dblog/dblog.admin.inc index f8a00c2..f77e63d 100644 --- a/modules/dblog/dblog.admin.inc +++ b/modules/dblog/dblog.admin.inc @@ -286,13 +286,18 @@ function theme_dblog_message($variables) { $event = $variables['event']; // Check for required properties. if (isset($event->message) && isset($event->variables)) { + $args = @unserialize($event->variables); // Messages without variables or user specified text. - if ($event->variables === 'N;') { + if ($args === NULL) { $output = $event->message; } + // Variables is not a NULL neither an array. + elseif (!is_array($args)) { + $output = t('Log data is corrupted and cannot be unserialized: @message', array('@message' => $event->message)); + } // Message to translate with injected variables. else { - $output = t($event->message, unserialize($event->variables)); + $output = t($event->message, $args); } // If the output is expected to be a link, strip all the tags and // special characters by using filter_xss() without any allowed tags.