Changeset 2292

Timestamp:

03/12/2008 01:07:56 PM (10 months ago)

Author:

Geert

Message:

Follow-up to r2291. Thanks to allain as well, for digging into this.

Files:

• trunk/system/core/Kohana.php (modified) (4 diffs)

trunk/system/core/Kohana.php

@@ -1141 +1141 @@
         protected $template = 'kohana_error_page';
 
-        // Message
-        protected $message = 'Unknown Exception: ';
-
         // Header
         protected $header = FALSE;
 
-        // Error code, filename, line number
+        // Error code
         protected $code = E_KOHANA;
-        protected $file = FALSE;
-        protected $line = FALSE;
 
         /**
@@ -1166 +1161 @@
 
                 // Handle error messages that are not set
-                if ($message == $error)
-                {
-                        $message .= $error;
+                if ($message === $error OR $message === array())
+                {
+                        $message = 'Unknown Exception: '.$error;
                 }
 
@@ -1226 +1221 @@
                 $this->code = $title;
 
-                if ($template != FALSE)
+                if ($template !== FALSE)
                 {
                         $this->template = $template;
@@ -1257 +1252 @@
                 Exception::__construct(Kohana::lang('core.page_not_found', $page));
 
-                $this->file = FALSE;
-                $this->line = FALSE;
-
                 $this->template = $template;
         }