From e6c6a975abf5c6cfe4e2be702ac6d2a62c5f9555 Mon Sep 17 00:00:00 2001 From: Florian Pritz Date: Sun, 18 Dec 2011 10:26:28 +0100 Subject: 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 --- application/controllers/file.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'application') 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); } -- cgit v1.2.3-24-g4f1b