From 2b5cdf161ccd7699bdd5de4207c3d4e12f2fe491 Mon Sep 17 00:00:00 2001
From: yanxd <sxty32@hotmail.com>
Date: Sun, 4 May 2014 18:49:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E8=83=BD=E5=88=A0=E9=99=A4=E5=B8=96?=
 =?UTF-8?q?=E5=AD=90=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                          | 3 ++-
 app/controllers/memos_controller.rb | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2524dd184..f58d75ea4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+*.swp
 /.project
 /.idea
 /.bundle
@@ -11,4 +12,4 @@
 /Gemfile
 /Gemfile.lock
 /db/schema.rb
-/Gemfile.lock
\ No newline at end of file
+/Gemfile.lock
diff --git a/app/controllers/memos_controller.rb b/app/controllers/memos_controller.rb
index f6ad48801..20f0b45c4 100644
--- a/app/controllers/memos_controller.rb
+++ b/app/controllers/memos_controller.rb
@@ -148,7 +148,8 @@ class MemosController < ApplicationController
 
   def find_memo
     return unless find_forum
-    @memo = @forum.memos.find(params[:id])
+    #@memo = @forum.memos.find(params[:id])
+    @memo = Memo.find(params[:id])
   rescue ActiveRecord::RecordNotFound
     render_404
     nil