summaryrefslogtreecommitdiffstats
path: root/application/core
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2016-11-01 17:27:20 +0100
committerFlorian Pritz <bluewind@xinu.at>2016-11-01 17:27:20 +0100
commitcb58719aa2db88fc810b1d5724ec9f6e7fdc984c (patch)
treeaf2055c6d513c4c3c3e3305e0539ed7f547581ab /application/core
parent9efd2db81ccf987a5455e0e4575c7d3f9072870f (diff)
parentc3d5786689bbc4a7f499f07cf1390afd800dc69a (diff)
Merge branch 'webui-multipaste' into dev
Diffstat (limited to 'application/core')
-rw-r--r--application/core/MY_Controller.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/application/core/MY_Controller.php b/application/core/MY_Controller.php
index ede6577da..078a4faa1 100644
--- a/application/core/MY_Controller.php
+++ b/application/core/MY_Controller.php
@@ -104,6 +104,9 @@ class MY_Controller extends CI_Controller {
$this->load->model("muser");
$this->data["user_logged_in"] = $this->muser->logged_in();
$this->data['redirect_uri'] = $this->uri->uri_string();
+ if ($this->muser->has_session()) {
+ $this->data['show_multipaste_queue'] = !empty((new \service\multipaste_queue)->get());
+ }
}
protected function _require_cli_request()