diff options
| author | Florian Pritz <bluewind@xinu.at> | 2013-09-25 15:03:59 +0200 |
|---|---|---|
| committer | Florian Pritz <bluewind@xinu.at> | 2013-09-25 15:03:59 +0200 |
| commit | 6705e6c987b6e4a43bbb666c33d8fc8a0ef1a0a6 (patch) | |
| tree | b815871f7f031633c400a33cf5d6245282d59955 /application/core | |
| parent | 50230001eb5387b6b0ff7ce906d074ef4a530d11 (diff) | |
| parent | ab98249a9a087745b29e5cb258ea0b624f12f64b (diff) | |
Merge branch 'working'
Diffstat (limited to 'application/core')
| -rw-r--r-- | application/core/MY_Controller.php | 3 | ||||
| -rw-r--r--[-rwxr-xr-x] | application/core/index.html | 0 |
2 files changed, 3 insertions, 0 deletions
diff --git a/application/core/MY_Controller.php b/application/core/MY_Controller.php index 47083035c..043b52ef7 100644 --- a/application/core/MY_Controller.php +++ b/application/core/MY_Controller.php @@ -99,5 +99,8 @@ class MY_Controller extends CI_Controller { } $this->data['title'] = "FileBin"; + + $this->load->model("muser"); + $this->data["user_logged_in"] = $this->muser->logged_in(); } } diff --git a/application/core/index.html b/application/core/index.html index c942a79ce..c942a79ce 100755..100644 --- a/application/core/index.html +++ b/application/core/index.html |