From 382214f3c13cc2ae4b927e37de7bc6e798fe900a Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Wed, 20 Jan 2010 23:00:39 -0800
Subject: Move the error page to the expected location for K24.

---
 modules/gallery_unit_test/views/kohana/error.php | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 modules/gallery_unit_test/views/kohana/error.php

(limited to 'modules/gallery_unit_test/views/kohana/error.php')

diff --git a/modules/gallery_unit_test/views/kohana/error.php b/modules/gallery_unit_test/views/kohana/error.php
new file mode 100644
index 00000000..c0ae7173
--- /dev/null
+++ b/modules/gallery_unit_test/views/kohana/error.php
@@ -0,0 +1,18 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<?
+echo $error, "\n\n";
+echo wordwrap($description, 80), "\n\n";
+if (!empty($line) && !empty($file)) {
+  echo $file, "[", $line, "]:\n";
+}
+echo $message, "\n\n";
+
+if (!empty($trace)) {
+  $trace = preg_replace(
+    array('/<li>/', '/<(.*?)>/', '/&gt;/'),
+    array("  ",     '',          '>'),
+    $trace);
+  echo "Stack Trace:\n";
+  echo $trace, "\n";
+}
+
-- 
cgit v1.2.3


From 3f3159d25caaea0c46583a6505c5dcc03b4fafe2 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Wed, 20 Jan 2010 23:05:51 -0800
Subject: Guard against missing/empty $description.

---
 modules/gallery_unit_test/views/kohana/error.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'modules/gallery_unit_test/views/kohana/error.php')

diff --git a/modules/gallery_unit_test/views/kohana/error.php b/modules/gallery_unit_test/views/kohana/error.php
index c0ae7173..34053317 100644
--- a/modules/gallery_unit_test/views/kohana/error.php
+++ b/modules/gallery_unit_test/views/kohana/error.php
@@ -1,7 +1,9 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <?
 echo $error, "\n\n";
-echo wordwrap($description, 80), "\n\n";
+if (!empty($description)) {
+  echo wordwrap($description, 80), "\n\n";
+}
 if (!empty($line) && !empty($file)) {
   echo $file, "[", $line, "]:\n";
 }
-- 
cgit v1.2.3


From 8a1c17d869575c9a19dc59e5470d664692f8e910 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Wed, 20 Jan 2010 23:14:51 -0800
Subject: Use the exception itself to print out a nice text message.

---
 modules/gallery_unit_test/views/kohana/error.php | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

(limited to 'modules/gallery_unit_test/views/kohana/error.php')

diff --git a/modules/gallery_unit_test/views/kohana/error.php b/modules/gallery_unit_test/views/kohana/error.php
index 34053317..079a279b 100644
--- a/modules/gallery_unit_test/views/kohana/error.php
+++ b/modules/gallery_unit_test/views/kohana/error.php
@@ -1,20 +1,6 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <?
-echo $error, "\n\n";
-if (!empty($description)) {
-  echo wordwrap($description, 80), "\n\n";
-}
-if (!empty($line) && !empty($file)) {
-  echo $file, "[", $line, "]:\n";
-}
-echo $message, "\n\n";
-
-if (!empty($trace)) {
-  $trace = preg_replace(
-    array('/<li>/', '/<(.*?)>/', '/&gt;/'),
-    array("  ",     '',          '>'),
-    $trace);
-  echo "Stack Trace:\n";
-  echo $trace, "\n";
-}
+echo $e->getMessage(), "\n";
+echo $e->getFile(), ":", $e->getLine(), "\n";
+echo $e->getTraceAsString(), "\n";
 
-- 
cgit v1.2.3