Ticket #513: view_patch.patch

home/maarten/webroot/kohana_trunk/system/libraries/View.php

@@ -42 +42 @@
          * @param   string  type of file: html, css, js, etc.
          * @return  void
          */
-        public function __construct($name, $data = NULL, $type = NULL)
+        public function __construct($name = NULL, $data = NULL, $type = NULL)
+        {
+                if(!empty($name))
+                {
+                        $this->set_view_file($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);
+                }
+
+                Log::add('debug', 'View Class Initialized ['.$name.']');
+        }
+        
+        /**
+         * Set the view file to be used
+         *
+         * @throws  Kohana_Exception  if the requested view cannot be found
+         * @param       string $name
+         * @param   string  type of file: html, css, js, etc.
+         * @return  void
+         */
+        public function set_view_file($name,$type=NULL)
         {
                 if (empty($type))
                 {
@@ -59 +83 @@
                         // Load the filename and set the content type
                         $this->kohana_filename = Kohana::find_file('views', $name, TRUE, $type);
                         $this->kohana_filetype = Config::item('mimes.'.$type);
-                        $this->kohana_filetype = empty($this->kohana_filetype) ? $type : $this->kohana_filetype;
+                        $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.']');
         }
-
+        
         /**
          * Sets a view variable.
          *
@@ -180 +196 @@
          */
         public function render($print = FALSE, $renderer = FALSE)
         {
+                if(empty($this->kohana_filename))
+                        throw new Kohana_Exception('core.view_not_set');
+                        
+                if(empty($this->kohana_filetype))
+                        throw new Kohana_Exception('core.view_extension_not_set');
+                
                 if (is_string($this->kohana_filetype))
                 {
                         // Merge global and local data, local overrides global with the same name