diff options
author | Seb Bacon <seb.bacon@gmail.com> | 2012-05-15 11:29:58 +0100 |
---|---|---|
committer | Seb Bacon <seb.bacon@gmail.com> | 2012-05-15 11:29:58 +0100 |
commit | 362b1cfdab4115478034e004c85001bb6d7abd68 (patch) | |
tree | aff7422269c160ab15277e7913646aed1ca32bb5 /app/controllers/comment_controller.rb | |
parent | 4593cc9e546878d69f795ce75808aae60656213c (diff) | |
parent | 95e7cd60a2ff78aa8550dc1855ee7c01a0f4c6f2 (diff) |
Merge branch 'develop' into feature/fix-404-in-themes
Diffstat (limited to 'app/controllers/comment_controller.rb')
-rw-r--r-- | app/controllers/comment_controller.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/comment_controller.rb b/app/controllers/comment_controller.rb index 86d5b0a06..d9cd002dd 100644 --- a/app/controllers/comment_controller.rb +++ b/app/controllers/comment_controller.rb @@ -9,14 +9,14 @@ class CommentController < ApplicationController before_filter :check_read_only, :only => [ :new ] protect_from_forgery :only => [ :new ] - + def new if params[:type] == 'request' @info_request = InfoRequest.find_by_url_title(params[:url_title]) @track_thing = TrackThing.create_track_for_request(@info_request) if params[:comment] @comment = Comment.new(params[:comment].merge({ - :comment_type => 'request', + :comment_type => 'request', :user => @user })) end @@ -38,7 +38,7 @@ class CommentController < ApplicationController # Default to subscribing to request when first viewing form params[:subscribe_to_request] = true end - + # See if values were valid or not if !params[:comment] || !@existing_comment.nil? || !@comment.valid? || params[:reedit] render :action => 'new' |