Changeset 466

Timestamp:

09/01/2007 05:04:16 PM (13 months ago)

Author:

Shadowhand

Message:

Small changes:

• Added config/mimes.php
  
• Updated View class to use mimes to determine the header to send
  
• Fixed User Guide special tags callback
  

Location:

trunk

Files:

• application/config/mimes.php (added)
• modules/user_guide/controllers/user_guide.php (modified) (1 diff)
• system/libraries/View.php (modified) (4 diffs)

trunk/modules/user_guide/controllers/user_guide.php

@@ -62 +62 @@
                                 url::redirect($ajax_return);
                         
-                        $this->data['menu'] = $this->load->view('user_guide/menu', array('active_category' => $category, 'active_section' => $section));
-                        $this->data['content'] = $this->load->view($content)->render(FALSE, 'Markdown');
+                        $template = $this->load->view('user_guide/template');
+                        $template->menu   = $this->load->view('user_guide/menu', array('active_category' => $category, 'active_section' => $section));
+                        $template->content = $this->load->view($content)->render(FALSE, 'Markdown');
 
                         // Display output
-                        $this->load->view('user_guide/template', $this->data)->render(TRUE);
+                        $template->render(TRUE);
                 }
         }

trunk/system/libraries/View.php

@@ -1 @@
-<?php  if (!defined('SYSPATH')) exit('No direct script access allowed');
+<?php defined('SYSPATH') or die('No direct access allowed.');
 /**
  * Kohana
@@ -33 +33 @@
 class View_Core {
 
+        // The view file name and type
         private $kohana_filename  = FALSE;
-        private $kohana_renderer  = FALSE;
         private $kohana_filetype  = FALSE;
-        private $kohana_protected = FALSE;
+
+        // Set variables
         private $data = array();
 
@@ -44 +45 @@
                 {
                         $type = $type[1];
+
                         $this->kohana_filename = Kohana::find_file('views', $name, TRUE, $type);
-                        
-                        if (function_exists('exif_imagetype'))
-                        {
-                                $this->kohana_filetype = image_type_to_mime_type(exif_imagetype($this->kohana_filename));
-                        }
-                        else
-                        {
-                                $this->kohana_filetype = 'image/'.$type;
-                        }
+                        $this->kohana_filetype = current(Config::item('mimes.'.$type));
                 }
                 else
                 {
                         $this->kohana_filename = Kohana::find_file('views', $name, TRUE);
+                        $this->kohana_filetype = EXT;
                 }
 
@@ -105 +100 @@
         public function render($print = FALSE, $callback = FALSE)
         {
-                if ($this->kohana_filetype == FALSE)
+                if ($this->kohana_filetype == EXT)
                 {
                         $output = Kohana::instance()->kohana_include_view($this->kohana_filename, $this->data);