From b0eba062a8fc325d972dee98de84bab82262175c Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 11 Mar 2015 11:20:43 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E3=80=81=E8=AF=BE=E7=A8=8B=E7=95=99=E8=A8=80=E4=B8=8D=E6=AD=A3?=
 =?UTF-8?q?=E7=A1=AE=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/forums/create_feedback.js.erb | 2 +-
 config/locales/zh.yml                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/forums/create_feedback.js.erb b/app/views/forums/create_feedback.js.erb
index 626840700..7d9fb6c9e 100644
--- a/app/views/forums/create_feedback.js.erb
+++ b/app/views/forums/create_feedback.js.erb
@@ -1,6 +1,6 @@
 $(function(){
     $("#button1").click(function(){
-        myTips(<%= l(:label_feedback_success)%>,"success");
+        myTips(<%= l(:label_forums_feedback_success)%>,"success");
     });
 
 })
\ No newline at end of file
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index b8add2739..bed4f138d 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -2328,7 +2328,7 @@ zh:
   
   label_technical_support: 技术支持：
   label_feedback: 意见反馈
-  label_feedback_success: "您的意见已经反馈到公共贴吧的新手讨论吧，我们会第一时间解决您的问题，谢谢支持！"
+  label_forums_feedback_success: "您的意见已经反馈到公共贴吧的新手讨论吧，我们会第一时间解决您的问题，谢谢支持！"
   
   
 

From eec155f0778c0588249326ba50ce72d5d3ae3ee9 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Wed, 11 Mar 2015 11:22:58 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2app=E8=87=AA=E5=8A=A8=E7=99=BB=E9=99=86?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/files_controller.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb
index 474f199a2..aacb32990 100644
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@@ -21,6 +21,7 @@ class FilesController < ApplicationController
 
   menu_item :files
   before_filter :auth_login1, :only => [:index]
+  before_filter :logged_user_by_apptoken,:only => [:index]
   before_filter :find_project_by_project_id#, :except => [:getattachtype]
   before_filter :authorize, :except => [:getattachtype,:quote_resource_show,:search]