summaryrefslogtreecommitdiffstats
path: root/application/controllers
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2012-04-09 11:22:03 +0200
committerFlorian Pritz <bluewind@xinu.at>2012-04-09 20:48:14 +0200
commitcb8b733a6c2333ff90d3af0fc37e8c21c73d9e7a (patch)
treedf73e68d134ba5100e454d2da41b6276dc4eb5c8 /application/controllers
parent2f149783585b88033f425a2ef4a0fdb06c8fb9f9 (diff)
Move is_cli_client() and random_id() to helper
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to 'application/controllers')
-rw-r--r--application/controllers/file.php2
-rw-r--r--application/controllers/user.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/application/controllers/file.php b/application/controllers/file.php
index e693a8667..e5e984b21 100644
--- a/application/controllers/file.php
+++ b/application/controllers/file.php
@@ -36,7 +36,7 @@ class File extends CI_Controller {
$this->var->latest_client = trim(file_get_contents(FCPATH.'data/client/latest'));
}
- $this->var->cli_client = $this->file_mod->is_cli_client();
+ $this->var->cli_client = is_cli_client();
if ($this->var->cli_client) {
$this->var->view_dir = "file_plaintext";
diff --git a/application/controllers/user.php b/application/controllers/user.php
index 2a73a1ef5..722996d93 100644
--- a/application/controllers/user.php
+++ b/application/controllers/user.php
@@ -13,7 +13,7 @@ class User extends CI_Controller {
$this->load->model("muser");
$this->data["title"] = "FileBin";
- $this->load->helper('form');
+ $this->load->helper(array('form', 'filebin'));
$this->var->view_dir = "user/";
$this->data['username'] = $this->muser->get_username();