summaryrefslogtreecommitdiffstats
path: root/lib/kolab_client_task.php
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2013-05-30 08:39:37 +0200
committerAleksander Machniak <alec@alec.pl>2013-05-30 08:39:37 +0200
commit3760d1e05304fb8c3dd1ea27ddb46c2e04f12eb1 (patch)
tree75c13804497f739752e75a3ee793fd4dabea268b /lib/kolab_client_task.php
parent4fbb0d9354d69e18b4677e46d93f75c986ea5a45 (diff)
downloadwebadmin-3760d1e05304fb8c3dd1ea27ddb46c2e04f12eb1.tar.gz
Fix lack of pagetitle on login page (Bug #1902)
Diffstat (limited to 'lib/kolab_client_task.php')
-rw-r--r--lib/kolab_client_task.php12
1 files changed, 7 insertions, 5 deletions
diff --git a/lib/kolab_client_task.php b/lib/kolab_client_task.php
index 4f3cce0..bcfa292 100644
--- a/lib/kolab_client_task.php
+++ b/lib/kolab_client_task.php
@@ -42,7 +42,7 @@ class kolab_client_task
protected $config;
protected $ajax_only = false;
- protected $page_title = 'Kolab Admin Panel';
+ protected $page_title = 'Kolab Web Admin Panel';
protected $menu = array();
protected $cache = array();
protected $devel_mode = false;
@@ -349,7 +349,7 @@ class kolab_client_task
$this->output->command('display_message', $error, 'error', 60000);
}
- $this->output->send('login');
+ $this->send('login');
exit;
}
@@ -381,16 +381,18 @@ class kolab_client_task
$this->output->assign('error_code', $code);
$this->output->assign('error_message', $msg);
- $this->output->send('error');
+ $this->send('error');
exit;
}
/**
* Output sending.
*/
- public function send()
+ public function send($template = null)
{
- $template = $this->get_task();
+ if (!$template) {
+ $template = $this->get_task();
+ }
if ($this->page_title) {
$this->output->assign('pagetitle', $this->page_title);