From 8cc14546f89d2af0dba81270e88fd59001c286bd Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Tue, 16 Sep 2014 10:27:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=85=B1=E8=B4=B4=E5=90=A7=E9=99=84?=
 =?UTF-8?q?=E4=BB=B6=E8=B5=84=E6=BA=90=E4=BF=AE=E6=94=B9=E4=B8=BA=E6=9C=AA?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E4=B9=9F=E5=8F=AF=E4=BB=A5=E4=B8=8B=E8=BD=BD?=
 =?UTF-8?q?=EF=BC=8C=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8=E7=A7=81=E6=9C=89?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/attachments_controller.rb | 2 +-
 app/helpers/projects_helper.rb            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index 4525176ac..62bef8fb1 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -361,7 +361,7 @@ private
 
   def login_without_softapplication
     referer = request.headers['Referer']
-    require_login unless referer =~ /softapplication/
+    require_login unless referer =~ /softapplication/ || referer =~ /memos/
   end
 
   def  renderTag
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index dfacff864..47f33f34a 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -181,7 +181,7 @@ module ProjectsHelper
           # unless project.is_public == 1
 
           if project.is_public != 1
-            s = "<span class='private_project'>#{l(:lable_private)}</span>".html_safe
+            s = "<span class='private_project'>#{l(:label_private)}</span>".html_safe
           else
             s = "".html_safe
           end
@@ -197,7 +197,7 @@ module ProjectsHelper
 
           if !project.is_public
           # end longjun
-            s = "<span class='private_project'>#{l(:lable_private)}</span>".html_safe
+            s = "<span class='private_project'>#{l(:label_private)}</span>".html_safe
           else
             s = "".html_safe
           end