Ticket #222: view.patch

system/config/view.php

@@ +1 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/*
+ * File: View
+ *
+ * Options:
+ *  allowed_types
+ */
+$config = array
+(
+        'allowed_types' => array('gif', 'jpeg', 'css', 'js', 'tiff', 'tif', 'swf')
+);

system/libraries/View.php

@@ -25 +25 @@
          */
         public function __construct($name, $data = NULL)
         {
-                if (preg_match('/\.(?:gif|jpe?g|png|css|js|tiff?|swf)$/Di', $name, $type))
+                $type = substr(strrchr($name, '.'), 1);
+                
+                if (in_array($type, Config::item('view.allowed_types')))
                 {
-                        $type = substr($type[0], 1);
-
                         $this->kohana_filename = Kohana::find_file('views', $name, TRUE, $type);
                         $this->kohana_filetype = current(Config::item('mimes.'.$type));
 
@@ -37 +37 @@
                 }
                 else
                 {
-                        $this->kohana_filename = Kohana::find_file('views', $name, TRUE);
-                        $this->kohana_filetype = EXT;
+                        $this->kohana_filename = Kohana::find_file('views', $name, TRUE, $type);
+                        $this->kohana_filetype = ($type == FALSE) ? EXT : $type;
                 }
 
                 if (is_array($data) AND ! empty($data))
@@ -178 +178 @@
                 return $output;
         }
 
-} // End View Class
- No newline at end of file
+} // End View Class