@@ -6,7 +6,7 @@ discard block |
||
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 | //FIXME: This is pretty much a phpUnit hack. Without it phpUnit fails here. We need a proper way to fake user/admin testing. |
@@ -17,13 +17,13 @@ discard block |
||
17 | 17 | |
18 | 18 | $this->global_data['theme'] = $this->User_Options->get('theme'); |
19 | 19 | if(ENVIRONMENT === 'production') { |
20 | - $this->global_data['compiled_css_path'] = function () { |
|
20 | + $this->global_data['compiled_css_path'] = function() { |
|
21 | 21 | $css_path = "css/main.{$this->global_data['theme']}"; |
22 | - return asset_url() . $css_path . filemtime(APPPATH . "../public/assets/{$css_path}.css") . '.css'; |
|
22 | + return asset_url().$css_path.filemtime(APPPATH."../public/assets/{$css_path}.css").'.css'; |
|
23 | 23 | }; |
24 | 24 | |
25 | 25 | $js_path = 'js/compiled.min'; |
26 | - $this->global_data['compiled_js_path'] = asset_url() . $js_path . filemtime(APPPATH . "../public/assets/{$js_path}.js") . '.js'; |
|
26 | + $this->global_data['compiled_js_path'] = asset_url().$js_path.filemtime(APPPATH."../public/assets/{$js_path}.js").'.js'; |
|
27 | 27 | } |
28 | 28 | } |
29 | 29 | |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | $json = is_array($json_input) ? json_encode($json_input) : $json_input; |
55 | 55 | |
56 | 56 | $this->output->set_content_type('application/json', 'utf-8'); |
57 | - $this->_render_content($json ?? '{}','json', $download, $filenamePrefix); |
|
57 | + $this->_render_content($json ?? '{}', 'json', $download, $filenamePrefix); |
|
58 | 58 | } |
59 | 59 | public function _render_content(string $content, string $filenameExt, bool $download = FALSE, string $filenamePrefix = 'tracker') : void { |
60 | 60 | if($download) { |