2 files changed, 46 insertions, 35 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 91fe35928..1873ca0d9 100644
--- a/views/failsafe/messages/exceptions/exception.php
+++ b/views/failsafe/messages/exceptions/exception.php
@@ -1,39 +1,20 @@
 <?php
+/**
+ * Elgg exception (failsafe mode)
+ * Displays a single exception
+ *
+ * @package Elgg
+ * @subpackage Core
+ *
+ * @uses $vars['object'] An exception
+ */
 
-	/**
-	 * Elgg exception (fallback mode)
-	 * Displays a single exception
-	 * 
-	 * @package Elgg
-	 * @subpackage Core
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Curverider Ltd
-	 * @copyright Curverider Ltd 2008-2009
-	 * @link http://elgg.org/
-	 * 
-	 * @uses $vars['object'] An exception
-	 */
-
-	global $CONFIG;
 ?>
 
-	<p class="messages-exception" style="background:#FDFFC3;display:block;padding:10px;">
-		<span title="<?php echo get_class($vars['object']); ?>">
-		<?php
-
-			echo nl2br($vars['object']->getMessage());
-		
-		?>
-		</span>
-	</p>
-	
- 	<?php if ($CONFIG->debug) { ?>
-	
-	<p class="messages-exception-detail" style="background:#FDFFC3;display:block;padding:10px;">
-		<?php
-
-			echo nl2br(htmlentities(print_r($vars['object'], true), ENT_QUOTES, 'UTF-8'));
-		
-		?>
-	</p>
-	<?php } ?> 
-\ No newline at end of file
+<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>