5 files changed, 33 insertions, 1 deletions
diff --git a/application/errors/error_404.php b/application/errors/error_404.php
index 792726a67..792726a67 100644..100755
--- a/application/errors/error_404.php
+++ b/application/errors/error_404.php
diff --git a/application/errors/error_db.php b/application/errors/error_db.php
index b396cda9f..b396cda9f 100644..100755
--- a/application/errors/error_db.php
+++ b/application/errors/error_db.php
diff --git a/application/errors/error_general.php b/application/errors/error_general.php
index fd63ce2c5..ae2bac76d 100644..100755
--- a/application/errors/error_general.php
+++ b/application/errors/error_general.php
@@ -1,3 +1,33 @@
+<?php
+
+// fancy error page only works if we can load helpers
+if (class_exists("CI_Controller") && !isset($GLOBALS["is_error_page"])) {
+	$title = "Error";
+	$GLOBALS["is_error_page"] = true;
+
+	$CI =& get_instance();
+	$CI->load->helper("filebin");
+	$CI->load->helper("url");
+
+	if (is_cli_client()) {
+		echo $heading."\n";
+		echo $message."\n";
+		exit();
+	}
+
+	include 'application/views/file/header.php';
+
+	?>
+		<div class="error">
+			<h1><?php echo $heading; ?></h1>
+			<?php echo $message; ?>
+		</div>
+
+	<?php
+	include 'application/views/file/footer.php';
+} else {
+	// default CI error page
+?>
 <!DOCTYPE html>
 <html lang="en">
 <head>
@@ -59,4 +89,6 @@ p {
 		<?php echo $message; ?>
 	</div>
 </body>
-</html>
-\ No newline at end of file
+</html>
+<?php
+}
diff --git a/application/errors/error_php.php b/application/errors/error_php.php
index f085c2037..f085c2037 100644..100755
--- a/application/errors/error_php.php
+++ b/application/errors/error_php.php
diff --git a/application/errors/index.html b/application/errors/index.html
index c942a79ce..c942a79ce 100644..100755
--- a/application/errors/index.html
+++ b/application/errors/index.html