|
@@ -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
|
//FIXME: This is pretty much a phpUnit hack. Without it phpUnit fails here. We need a proper way to fake user/admin testing. |
|
@@ -19,10 +19,10 @@ discard block |
|
|
block discarded – undo |
|
19
|
19
|
$this->global_data['theme'] = $this->User_Options->get('theme'); |
|
20
|
20
|
if(ENVIRONMENT !== 'development') { |
|
21
|
21
|
$css_path = "css/main.{$this->User_Options->get('theme')}"; |
|
22
|
|
- $this->global_data['complied_css_path'] = asset_url()."{$css_path}.".filemtime(APPPATH . "../public/assets/{$css_path}.css").".css"; |
|
|
22
|
+ $this->global_data['complied_css_path'] = asset_url()."{$css_path}.".filemtime(APPPATH."../public/assets/{$css_path}.css").".css"; |
|
23
|
23
|
|
|
24
|
24
|
$js_path = 'js/compiled.min'; |
|
25
|
|
- $this->global_data['complied_js_path'] = asset_url()."{$js_path}.".filemtime(APPPATH . "../public/assets/{$js_path}.js").".js"; |
|
|
25
|
+ $this->global_data['complied_js_path'] = asset_url()."{$js_path}.".filemtime(APPPATH."../public/assets/{$js_path}.js").".js"; |
|
26
|
26
|
} |
|
27
|
27
|
} |
|
28
|
28
|
|
|
@@ -47,7 +47,7 @@ discard block |
|
|
block discarded – undo |
|
47
|
47
|
$json = is_array($json_input) ? json_encode($json_input) : $json_input; |
|
48
|
48
|
|
|
49
|
49
|
$this->output->set_content_type('application/json', 'utf-8'); |
|
50
|
|
- $this->_render_content($json ?? '{}','json', $download, $filenamePrefix); |
|
|
50
|
+ $this->_render_content($json ?? '{}', 'json', $download, $filenamePrefix); |
|
51
|
51
|
} |
|
52
|
52
|
public function _render_content(string $content, string $filenameExt, bool $download = FALSE, string $filenamePrefix = 'tracker') : void { |
|
53
|
53
|
if($download) { |
DakuTree /
manga-tracker
