summaryrefslogtreecommitdiffstats
path: root/application/controllers
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2012-10-07 00:14:18 +0200
committerFlorian Pritz <bluewind@xinu.at>2012-10-07 00:14:18 +0200
commitbd3dd61b8fb3fd77ac830b1ee26bc23c0d0eeadc (patch)
tree3fc9414069a979de28013bc4b7f2bc443723d1b2 /application/controllers
parentcac62df50784709e8885cba7d03babcd94bd0a01 (diff)
c/file/download: stop working around CI's output class
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to 'application/controllers')
-rw-r--r--application/controllers/file.php7
1 files changed, 4 insertions, 3 deletions
diff --git a/application/controllers/file.php b/application/controllers/file.php
index 24ecfcf37..19d044476 100644
--- a/application/controllers/file.php
+++ b/application/controllers/file.php
@@ -161,7 +161,7 @@ class File extends CI_Controller {
$this->data['current_highlight'] = htmlspecialchars($mode);
$this->data['timeout'] = $this->mfile->get_timeout_string($id);
- echo $this->load->view($this->var->view_dir.'/html_header', $this->data, true);
+ $this->load->view($this->var->view_dir.'/html_header', $this->data);
// highlight the file and chache the result
$this->load->library("MemcacheLibrary");
@@ -185,9 +185,10 @@ class File extends CI_Controller {
ob_end_clean();
$this->memcachelibrary->set($filedata['hash'].'_'.$mode, $cached, 100);
}
- echo $cached;
- echo $this->load->view($this->var->view_dir.'/html_footer', $this->data, true);
+ $this->output->append_output($cached);
+
+ $this->load->view($this->var->view_dir.'/html_footer', $this->data);
return;
}