4 files changed, 38 insertions, 39 deletions
diff --git a/views/failsafe/canvas/default.php b/views/failsafe/canvas/default.php
deleted file mode 100644
index 4b8d12e6d..000000000
--- a/views/failsafe/canvas/default.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-/**
- * Elgg default layout
- *
- * @package Elgg
- * @subpackage Core
- */
-
-for ($i = 1; $i < 8; $i++) {
-	if (isset($vars["area{$i}"])) {
-		echo $vars["area{$i}"];
-	}
-}
-\ No newline at end of file
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
-
-}
diff --git a/views/failsafe/page/shells/default.php b/views/failsafe/page/default.php
index 0ce63cc1d..6d628ebbb 100644
--- a/views/failsafe/page/shells/default.php
+++ b/views/failsafe/page/default.php
@@ -33,7 +33,7 @@ header('Content-type: text/html; charset=utf-8');
 		p {
 			margin: 0px 0px 15px 0;
 		}
-		#wrapper {
+		#elgg-wrapper {
 			background:white;
 			width:570px;
 			margin:auto;
@@ -43,7 +43,7 @@ header('Content-type: text/html; charset=utf-8');
 			border-right: 1px solid #666666;
 			border-bottom: 1px solid #666666;
 		}
-		.messages_exception {
+		.elgg-messages-exception {
 			background:#FDFFC3;
 			display:block;
 			padding:10px;
@@ -52,7 +52,7 @@ header('Content-type: text/html; charset=utf-8');
 
 	</head>
 	<body>
-	<div id="wrapper">
+	<div id="elgg-wrapper">
 		<h1><?php echo $vars['title']; ?></h1>
 		<?php echo $vars['body']; ?>
 	</div>