summaryrefslogtreecommitdiffstats
path: root/controllers
diff options
context:
space:
mode:
authorBernhard Posselt <nukeawhale@gmail.com>2012-10-13 05:03:05 +0200
committerBernhard Posselt <nukeawhale@gmail.com>2012-10-13 05:03:05 +0200
commite5980c81413db26e42a2503cc751e1e03b9aa8b1 (patch)
tree7e3393e33e3969e6d2b370a293c073ec3d987bfd /controllers
parent4b5f94b435b4756e3aa9e1a3fad3820ce1389ba8 (diff)
fixed bug that prevented creating of folders, linted menu.js, fixed weird html escaping for feed titles, removed all database queries from templates
Diffstat (limited to 'controllers')
-rw-r--r--controllers/controller.php2
-rw-r--r--controllers/news.controller.php8
2 files changed, 2 insertions, 8 deletions
diff --git a/controllers/controller.php b/controllers/controller.php
index 82f60df76..73ad3ad4d 100644
--- a/controllers/controller.php
+++ b/controllers/controller.php
@@ -86,7 +86,7 @@ class Controller {
if(array_key_exists($key, $safeParams)) {
$template->assign($key, $value, false);
} else {
- $template->assign($key, $value, false);
+ $template->assign($key, $value);
}
}
diff --git a/controllers/news.controller.php b/controllers/news.controller.php
index ba3005b01..0ad4302d9 100644
--- a/controllers/news.controller.php
+++ b/controllers/news.controller.php
@@ -12,13 +12,7 @@
namespace OCA\News;
-
-class FeedType {
- const FEED = 0;
- const FOLDER = 1;
- const STARRED = 2;
- const SUBSCRIPTIONS = 3;
-}
+require_once(\OC_App::getAppPath('news') . '/lib/feedtypes.php');
class NewsController extends Controller {