Merge branch 'master' of github.com:diaspora/diaspora

This commit is contained in:
maxwell 2011-01-13 17:31:44 -08:00
commit 641b805da2
2 changed files with 2 additions and 2 deletions

View file

@ -21,7 +21,7 @@
%params %params
#publisher_textarea_wrapper #publisher_textarea_wrapper
%ul#photodropzone %ul#photodropzone
= status.text_area :message, :rows => 2, :value => params[:prefill] = status.text_area :message, :rows => 2, :value => h(params[:prefill])
- for aspect_id in @aspect_ids - for aspect_id in @aspect_ids
= hidden_field_tag 'aspect_ids[]', aspect_id.to_s = hidden_field_tag 'aspect_ids[]', aspect_id.to_s

View file

@ -7,5 +7,5 @@
= link_to t('.reshare'), "#" = link_to t('.reshare'), "#"
%ul.reshare_box %ul.reshare_box
= aspect_links(aspects, :prefill => CGI::escape(post.message)) = aspect_links(aspects, :prefill => post.message)