Changeset 1592
- Timestamp:
- 12/19/2007 11:27:52 PM (10 months ago)
- Files:
-
- 1 modified
-
trunk/system/libraries/View.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/system/libraries/View.php
r1533 r1592 59 59 $this->kohana_filename = Kohana::find_file('views', $name.'.'.$type, TRUE, $type); 60 60 $this->kohana_filetype = Config::item('mimes.'.$type); 61 $this->kohana_filetype = empty($this->kohana_filetype) ? $type : $this->kohana_filetype; 61 62 } 62 63 … … 165 166 public function render($print = FALSE, $renderer = FALSE) 166 167 { 167 if ( $this->kohana_filetype === EXT)168 if (is_string($this->kohana_filetype)) 168 169 { 169 170 // Merge global and local data, local overrides global with the same name
