Merge branch 'error-hotfix'

cdevroe · Mar 11, 2014 · b4d7bfe · b4d7bfe
2 parents b9c0459 + 8e4983a
commit b4d7bfe
Showing 1 changed file with 13 additions and 24 deletions.
diff --git a/application/errors/error_php.php b/application/errors/error_php.php
@@ -1,24 +1,13 @@
-<!DOCTYPE html>
-<html>
-<head>
- <title>Eek, something is wrong</title>
- <link href='http://fonts.googleapis.com/css?family=Lato:300,400|Merriweather' rel='stylesheet' type='text/css'>
- <link rel="stylesheet" href="/assets/css/unmark.css">
- <link rel="icon" type="image/ico" href="/favicon.ico">
-</head>
-<body class="unmark-solo" id="unmark-login">
- <div id="error-wrapper">
- <div id="error-icon"><img src="/assets/images/icons/large_x.png" /></div>
- <?php if (defined('ENVIRONMENT') && ENVIRONMENT === 'production'): ?>
- <h1>An unexpected error has occured</h1>
- <p>The issue has been logged and will be taken care of shortly.</p>
- <?php else: ?>
- <h1>A PHP Error was encountered</h1>
- <p>Severity: <?php echo $severity; ?></p>
- <p>Message: <?php echo $message; ?></p>
- <p>Filename: <?php echo $filepath; ?></p>
- <p>Line Number: <?php echo $line; ?></p>
- <?php endif; ?>
- </div>
-</body>
-</html>
+<div id="error-wrapper">
+ <div id="error-icon"><img src="/assets/images/icons/large_x.png" /></div>
+ <?php if (defined('ENVIRONMENT') && ENVIRONMENT === 'production'): ?>
+ <h1>An unexpected error has occured</h1>
+ <p>The issue has been logged and will be taken care of shortly.</p>
+ <?php else: ?>
+ <h1>A PHP Error was encountered</h1>
+ <p>Severity: <?php echo $severity; ?></p>
+ <p>Message: <?php echo $message; ?></p>
+ <p>Filename: <?php echo $filepath; ?></p>
+ <p>Line Number: <?php echo $line; ?></p>
+ <?php endif; ?>
+</div>