From e5980c81413db26e42a2503cc751e1e03b9aa8b1 Mon Sep 17 00:00:00 2001
From: Bernhard Posselt <nukeawhale@gmail.com>
Date: Sat, 13 Oct 2012 05:03:05 +0200
Subject: fixed bug that prevented creating of folders, linted menu.js, fixed
 weird html escaping for feed titles, removed all database queries from
 templates

---
 controllers/controller.php      | 2 +-
 controllers/news.controller.php | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

(limited to 'controllers')

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 {
-- 
cgit v1.2.3