summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2011-12-18 10:26:28 +0100
committerFlorian Pritz <bluewind@xinu.at>2011-12-18 10:26:28 +0100
commite6c6a975abf5c6cfe4e2be702ac6d2a62c5f9555 (patch)
treed5d528cfd35355603d6635d5096cc641db2011d7
parentc1e8e6e85a9fb9aea5567c7f867528fe5af5dac7 (diff)
remove parameter of client()
Parameters of controller functions are treated as url parameter so file/client/0 would also disable the headers. The cli client has empty headers anyway so just check that. Signed-off-by: Florian Pritz <bluewind@xinu.at>
-rw-r--r--application/controllers/file.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/application/controllers/file.php b/application/controllers/file.php
index d14e4879a..90e686c8d 100644
--- a/application/controllers/file.php
+++ b/application/controllers/file.php
@@ -64,7 +64,7 @@ class File extends CI_Controller {
}
}
- function client($load_header = true)
+ function client()
{
$data['title'] = 'Client';
if ($this->var->latest_client) {
@@ -76,11 +76,11 @@ class File extends CI_Controller {
$data['client_link_deb'] = base_url().'data/client/deb/';
$data['client_link_slackware'] = base_url().'data/client/slackware/';
- if ($load_header) {
+ if (!$this->var->cli_client) {
$this->load->view($this->var->view_dir.'/header', $data);
}
$this->load->view($this->var->view_dir.'/client', $data);
- if ($load_header) {
+ if (!$this->var->cli_client) {
$this->load->view($this->var->view_dir.'/footer', $data);
}
}
@@ -97,7 +97,7 @@ class File extends CI_Controller {
$this->load->view($this->var->view_dir.'/header', $data);
$this->load->view($this->var->view_dir.'/upload_form', $data);
if ($this->var->cli_client) {
- $this->client(false);
+ $this->client();
}
$this->load->view($this->var->view_dir.'/footer', $data);
}