@@ -30,7 +30,8 @@ class Activity < ActiveRecord::Base find(:all, :joins => "INNER JOIN people p ON activities.person_id = p.id", :conditions => [%(p.deactivated = ? AND - (p.email_verified IS NULL OR p.email_verified = ?)), + (p.email_verified IS NULL OR + p.email_verified = ?)), false, true], :order => 'activities.created_at DESC', :limit => GLOBAL_FEED_SIZE) app/models/activity.rb @@ -60,11 +60,7 @@ <div class="form_row"> <%= f.label :about %> <p><%= formatting_note %></p> - <%= fckeditor_textarea("preferences", :about, - :toolbarSet => 'InsoshiBase', :width => '100%', - :height => RICH_TEXT_HEIGHT) %> - - <%# f.text_area :about, :rows => 10 %> + <%= f.text_area :about, :rows => 10 %> </div> <br /> app/views/admin/preferences/edit.html.erb @@ -15,7 +15,7 @@ module ActivityLogger include_person = options[:include_person] activity = options[:activity] || Activity.create!(:item => options[:item], :person => person) - + people_ids = people_to_add(person, activity, include_person) do_feed_insert(people_ids, activity.id) unless people_ids.empty? end lib/activity_logger.rb 8764d0977c15fe360e34b82e54ca76639c73472f Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/b9d175124557e8f6f84a46a173433e1b88a0253a b9d175124557e8f6f84a46a173433e1b88a0253a 2009-04-22T11:40:21-07:00 2009-04-22T11:40:21-07:00 Axed FCKeditor on About page 139b8200cf05259ca2eb5e8e9ab8583155d88523 Michael Hartl michael@michaelhartl.com