From 31a4ecc8e8e94e1888551f69382a4d7e2e5d1b0a Mon Sep 17 00:00:00 2001
From: yanxd <sxty32@hotmaill.com>
Date: Thu, 5 Dec 2013 08:52:41 +0800
Subject: [PATCH] welcome activity, eventtypes: Forum=>Memo, Memo=>Reply.

---
 app/models/memo.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/memo.rb b/app/models/memo.rb
index f18037f04..b6871c99c 100644
--- a/app/models/memo.rb
+++ b/app/models/memo.rb
@@ -20,7 +20,7 @@ class Memo < ActiveRecord::Base
 				  :datetime => :created_at,
 				  :description => :content,
 				  :author => :author,
-				  :type => Proc.new {|o| o.parent_id.nil? ? 'Forum' : 'Memo'},
+				  :type => Proc.new {|o| o.parent_id.nil? ? 'Memo' : 'Reply'},
 				  :url => Proc.new {|o| {:controller => 'memos', :action => 'show', :forum_id => o.forum_id}.merge(o.parent_id.nil? ? {:id => o.id} : {:id => o.parent_id, :anchor => "reply-#{o.id}"})}
 	acts_as_activity_provider :author_key => :author_id,
 							  :func => 'memos',