Changeset 2291

Timestamp:

03/12/2008 11:27:31 AM (9 months ago)

Author:

Geert

Message:

Calling parent's constructor for Kohana_Exceptions

Files:

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

trunk/system/core/Kohana.php

@@ -1168 +1168 @@
                 if ($message == $error)
                 {
-                        $this->message .= $error;
-                }
-                else
-                {
-                        $this->message = $message;
-                }
+                        $message .= $error;
+                }
+
+                // Sets $this->message the proper way
+                parent::__construct($message);
         }
 
@@ -1223 +1222 @@
         public function __construct($title, $message, $template = FALSE)
         {
-                $this->code     = $title;
-                $this->message  = $message;
+                Exception::__construct($message);
+
+                $this->code = $title;
 
                 if ($template != FALSE)
@@ -1255 +1255 @@
                 }
 
-                $this->message = Kohana::lang('core.page_not_found', $page);
-                $this->file    = FALSE;
-                $this->line    = FALSE;
+                Exception::__construct(Kohana::lang('core.page_not_found', $page));
+
+                $this->file = FALSE;
+                $this->line = FALSE;
 
                 $this->template = $template;