simplification

This commit is contained in:
Claude 2013-03-26 17:00:06 +01:00
parent 708825d5c6
commit ced4445dd1

View File

@ -17,15 +17,15 @@ class Theme_assets extends CI_Controller
function __construct() function __construct()
{ {
parent::__construct(); parent::__construct();
$this->theme = config_item('theme');
} }
function css() function css()
{ {
$theme = config_item('theme');
$css_file = $this->uri->segment(4); $css_file = $this->uri->segment(4);
//file path //file path
$file_path = 'themes/' . $theme . '/css/' . $css_file; $file_path = 'themes/' . $this->theme . '/css/' . $css_file;
//fallback to default css if view in theme not found //fallback to default css if view in theme not found
@ -42,11 +42,10 @@ class Theme_assets extends CI_Controller
function images() function images()
{ {
$theme = config_item('theme');
$image_file = $this->uri->segment(4); $image_file = $this->uri->segment(4);
//file path //file path
$file_path = 'themes/' . $theme . '/images/' . $image_file; $file_path = 'themes/' . $this->theme . '/images/' . $image_file;
//fallback to default css if view in theme not found //fallback to default css if view in theme not found
@ -63,7 +62,6 @@ class Theme_assets extends CI_Controller
function js() function js()
{ {
$theme = config_item('theme');
//get js //get js
$segments = $this->uri->segment_array(); $segments = $this->uri->segment_array();
@ -74,7 +72,7 @@ class Theme_assets extends CI_Controller
$js_file = str_replace('../', '', $js_file); $js_file = str_replace('../', '', $js_file);
//file path //file path
$file_path = 'themes/' . $theme . '/js/' . $js_file; $file_path = 'themes/' . $this->theme . '/js/' . $js_file;
//send //send
header('Content-type: application/x-javascript'); header('Content-type: application/x-javascript');