|
@@ -6,7 +6,7 @@ discard block |
|
|
block discarded – undo |
|
6
|
6
|
protected $footer_data = array(); |
|
7
|
7
|
public $global_data = array(); |
|
8
|
8
|
|
|
9
|
|
- public function __construct(){ |
|
|
9
|
+ public function __construct() { |
|
10
|
10
|
parent::__construct(); |
|
11
|
11
|
|
|
12
|
12
|
$this->load->driver('cache', array('adapter' => 'file', 'backup' => 'apc')); //Sadly we can't autoload this with params |
|
@@ -20,10 +20,10 @@ discard block |
|
|
block discarded – undo |
|
20
|
20
|
$this->global_data['analytics_tracking_id'] = $this->config->item('tracking_id'); |
|
21
|
21
|
|
|
22
|
22
|
$css_path = "css/main.{$this->User_Options->get('theme')}"; |
|
23
|
|
- $this->global_data['complied_css_path'] = asset_url()."{$css_path}.".filemtime(APPPATH . "../public/assets/{$css_path}.css").".css"; |
|
|
23
|
+ $this->global_data['complied_css_path'] = asset_url()."{$css_path}.".filemtime(APPPATH."../public/assets/{$css_path}.css").".css"; |
|
24
|
24
|
|
|
25
|
25
|
$js_path = 'js/compiled.min'; |
|
26
|
|
- $this->global_data['complied_js_path'] = asset_url()."{$js_path}.".filemtime(APPPATH . "../public/assets/{$js_path}.js").".js"; |
|
|
26
|
+ $this->global_data['complied_js_path'] = asset_url()."{$js_path}.".filemtime(APPPATH."../public/assets/{$js_path}.js").".js"; |
|
27
|
27
|
} |
|
28
|
28
|
|
|
29
|
29
|
public function _render_page(/*(array) $paths*/) { |
Please login to merge, or discard this patch.