Changeset 2492

Timestamp:

04/15/2008 12:57:12 AM (6 months ago)

Author:

Shadowhand

Message:

Fixing #513, thanks memon.

Location:

trunk/system

Files:

• i18n/en_US/core.php (modified) (1 diff)
• libraries/View.php (modified) (4 diffs)

trunk/system/i18n/en_US/core.php

@@ -3 +3 @@
 $lang = array
 (
-        'there_can_be_only_one' => 'There can be only one instance of Kohana per page request.',
+        'there_can_be_only_one' => 'There can be only one instance of Kohana per page request',
         'uncaught_exception'    => 'Uncaught %s: %s in file %s on line %s',
-        'invalid_method'        => 'Invalid method <tt>%s</tt> called in <tt>%s</tt>.',
-        'cannot_write_log'      => 'Your log.directory config setting does not point to a writable directory.',
-        'resource_not_found'    => 'The requested %s, <tt>%s</tt>, could not be found.',
-        'invalid_filetype'      => 'The requested filetype, <tt>.%s</tt>, is not allowed in your view configuration file.',
-        'no_default_route'      => 'Please set a default route in <tt>config/routes.php</tt>.',
+        'invalid_method'        => 'Invalid method <tt>%s</tt> called in <tt>%s</tt>',
+        'cannot_write_log'      => 'Your log.directory config setting does not point to a writable directory',
+        'resource_not_found'    => 'The requested %s, <tt>%s</tt>, could not be found',
+        'invalid_filetype'      => 'The requested filetype, <tt>.%s</tt>, is not allowed in your view configuration file',
+        'view_set_filename'     => 'You must set the the view filename before calling render',
+        'no_default_route'      => 'Please set a default route in <tt>config/routes.php</tt>',
         'no_controller'         => 'Kohana was not able to determine a controller to process this request: %s',
         'page_not_found'        => 'The page you requested, <tt>%s</tt>, could not be found.',

trunk/system/libraries/View.php

@@ -29 +29 @@
          * @return  object
          */
-        public static function factory($name, $data = NULL, $type = NULL)
+        public static function factory($name = NULL, $data = NULL, $type = NULL)
         {
                 return new View($name, $data, $type);
@@ -43 +43 @@
          * @return  void
          */
-        public function __construct($name, $data = NULL, $type = NULL)
+        public function __construct($name = NULL, $data = NULL, $type = NULL)
+        {
+                if ( ! empty($name))
+                {
+                        // Set the filename
+                        $this->set_filename($name, $type);
+                }
+
+                if (is_array($data) AND ! empty($data))
+                {
+                        // Preload data using array_merge, to allow user extensions
+                        $this->data = array_merge($this->data, $data);
+                }
+        }
+
+        public function set_filename($name, $type = NULL)
         {
                 if (empty($type))
@@ -62 +77 @@
                         $this->kohana_filetype = empty($this->kohana_filetype) ? $type : $this->kohana_filetype;
                 }
-
-                if (is_array($data) AND ! empty($data))
-                {
-                        // Preload data using array_merge, to allow user extensions
-                        $this->data = array_merge($this->data, $data);
-                }
-
-                Log::add('debug', 'View Class Initialized ['.$name.']');
         }
 
@@ -181 +188 @@
         public function render($print = FALSE, $renderer = FALSE)
         {
+                if (empty($this->kohana_filename))
+                        throw new Kohana_Exception('core.view_set_filename');
+
                 if (is_string($this->kohana_filetype))
                 {