From 3179ebabc984c76cdb75320c969f0ec73ef7c3eb Mon Sep 17 00:00:00 2001
From: Maxwell Salzberg <maxwell@joindiaspora.com>
Date: Sat, 15 Oct 2011 22:37:53 -0700
Subject: [PATCH] fix tag stream

---
 app/views/tags/show.haml | 4 ++--
 lib/stream/tag.rb        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/tags/show.haml b/app/views/tags/show.haml
index a672702c0b..6e5017e6cf 100644
--- a/app/views/tags/show.haml
+++ b/app/views/tags/show.haml
@@ -36,10 +36,10 @@
 
 .span-6.tags_people
   %h3
-    = t('people', :count => @stream.people_count)
+    = t('people', :count => @stream.tagge_people_count)
 
   .side_stream.stream
-    = render :partial => 'people/index', :locals => {:people => @stream.people}
+    = render :partial => 'people/index', :locals => {:people => @stream.tagged_people}
 
   %br
 
diff --git a/lib/stream/tag.rb b/lib/stream/tag.rb
index 312a3b58f9..f5dceb2b82 100644
--- a/lib/stream/tag.rb
+++ b/lib/stream/tag.rb
@@ -19,11 +19,11 @@ class Stream::Tag < Stream::Base
     @display_tag_name ||= "##{tag_name}"
   end
 
-  def people
+  def tagged_people
     @people ||= Person.profile_tagged_with(tag_name).paginate(:page => people_page, :per_page => 15)
   end
 
-  def people_count
+  def tagge_people_count
     @people_count ||= Person.profile_tagged_with(tag_name).count
   end
 
-- 
GitLab