2 files changed, 35 insertions, 23 deletions
diff --git a/views/failsafe/messages/exceptions/admin_exception.php b/views/failsafe/messages/exceptions/admin_exception.php
new file mode 100644
index 000000000..57665d9c0
--- /dev/null
+++ b/views/failsafe/messages/exceptions/admin_exception.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Elgg exception (failsafe mode)
+ * Displays a single exception
+ *
+ * @package Elgg
+ * @subpackage Core
+ *
+ * @uses $vars['object'] An exception
+ */
+
+?>
+
+<p class="elgg-messages-exception">
+	<span title="<?php echo get_class($vars['object']); ?>">
+	<?php
+
+		echo nl2br($vars['object']->getMessage());
+
+	?>
+	</span>
+</p>
+
+<p class="elgg-messages-exception">
+	<?php
+
+		echo nl2br(htmlentities(print_r($vars['object'], true), ENT_QUOTES, 'UTF-8'));
+
+	?>
+</p>
+\ No newline at end of file
diff --git a/views/failsafe/messages/exceptions/exception.php b/views/failsafe/messages/exceptions/exception.php
index e14eb629d..1873ca0d9 100644
--- a/views/failsafe/messages/exceptions/exception.php
+++ b/views/failsafe/messages/exceptions/exception.php
@@ -11,28 +11,10 @@
 
 ?>
 
-<p class="messages_exception">
-	<span title="<?php echo get_class($vars['object']); ?>">
-	<?php
-
-		echo nl2br($vars['object']->getMessage());
-
-	?>
+<p class="elgg-messages-exception">
+	<span title="Unrecoverable Error">
+		<?php echo elgg_echo('exception:contact_admin'); ?>
+		<br /><br />
+		Exception #<?php echo $vars['ts']; ?>.
 	</span>
 </p>
-
-<?php
-global $CONFIG;
-if (isset($CONFIG->debug)) {
-?>
-
-<p class="messages_exception">
-	<?php
-
-		echo nl2br(htmlentities(print_r($vars['object'], true), ENT_QUOTES, 'UTF-8'));
-
-	?>
-</p>
-<?php
-
-}