diff options
| author | 85pando <85pando@googlemail.com> | 2016-02-05 10:28:40 +0100 |
|---|---|---|
| committer | 85pando <85pando@googlemail.com> | 2016-02-05 10:28:40 +0100 |
| commit | 791d13c87bf510d913973b77a5f6d152311a1d87 (patch) | |
| tree | 81412e8dbd3ac4fa0047030a6068afafd975687e /app/Controller/Calendar.php | |
| parent | 2074aaaa9a75455097e4e77ca09f4fba3e567052 (diff) | |
| parent | 12aaec03b19a07635f59b00f532c92c37ac1df5f (diff) | |
Merge remote-tracking branch 'refs/remotes/upstream/master'
Conflicts:
app/Locale/de_DE/translations.php
Diffstat (limited to 'app/Controller/Calendar.php')
| -rw-r--r-- | app/Controller/Calendar.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/Controller/Calendar.php b/app/Controller/Calendar.php index 67a402d3..a0a25e41 100644 --- a/app/Controller/Calendar.php +++ b/app/Controller/Calendar.php @@ -20,7 +20,7 @@ class Calendar extends Base */ public function show() { - $this->response->html($this->template->layout('calendar/show', array( + $this->response->html($this->helper->layout->app('calendar/show', array( 'check_interval' => $this->config->get('board_private_refresh_interval'), ) + $this->getProjectFilters('calendar', 'show'))); } |