fix #2403, remove unused code

app/views/forum_posts/partials/new/_form.html.erb

@@ -4,8 +4,6 @@
   <%= f.input :topic_id, :as => :hidden %>
   <%= dtext_field "forum_post", "body" %>
 
-  <%= f.input :receive_email_notifications, :as => :boolean %>
-
   <%= f.button :submit, "Submit" %>
   <%= dtext_preview_button "forum_post", "body" %>
 <% end %>

app/views/forum_topics/_form.html.erb

@@ -15,8 +15,6 @@
       <% end %>
 
       <%= dtext_field "forum_post", "body", :input_name => "forum_topic[original_post_attributes][body]", :value => forum_topic.original_post.body, :input_id => "forum_post_body_for_#{forum_topic.original_post.id}", :preview_id => "dtext-preview-for-#{forum_topic.original_post.id}" %>
-
-      <%= pf.input :receive_email_notifications, :as => :boolean %>
     <% end %>
 
     <% if CurrentUser.is_janitor? %>

app/views/forum_topics/_secondary_links.html.erb

@@ -15,6 +15,11 @@
       <li><%= link_to "Reply", new_forum_post_path(:topic_id => @forum_topic.id) %></li>
       <% if !@forum_topic.new_record? && @forum_topic.editable_by?(CurrentUser.user) %>
         <li><%= link_to "Edit", edit_forum_topic_path(@forum_topic) %></li>
+        <% if @forum_topic.user_subscription(CurrentUser.user) %>
+          <li><%= link_to "Unsubscribe", unsubscribe_forum_topic_path(@forum_topic), :method => :post %></li>
+        <% else %>
+          <li><%= link_to "Subscribe", subscribe_forum_topic_path(@forum_topic), :method => :post, :data => {:confirm => "Are you sure you want to subscribe to this forum topic?"} %></li>
+        <% end %>
         <% if CurrentUser.is_janitor? %>
           <% if @forum_topic.is_deleted? %>
             <li><%= link_to "Undelete", undelete_forum_topic_path(@forum_topic), :method => :post %></li>