Fixed: error raised when trying to add an empty comment to a news (#3615).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2820 e93f8b46-1217-0410-a6f0-8f06a7374b81

2 files changed, 10 insertions, 0 deletions

diff --git a/app/controllers/news_controller.rb b/app/controllers/news_controller.rb
index 9fc9f5b6a..a8ad716ee 100644
--- a/app/controllers/news_controller.rb
+++ b/app/controllers/news_controller.rb
@@ -64,6 +64,7 @@ class NewsController < ApplicationController
       flash[:notice] = l(:label_comment_added)
       redirect_to :action => 'show', :id => @news
     else
+      show
       render :action => 'show'
     end
   end
diff --git a/test/functional/news_controller_test.rb b/test/functional/news_controller_test.rb
index a31362444..cea35ca4a 100644
--- a/test/functional/news_controller_test.rb
+++ b/test/functional/news_controller_test.rb
@@ -179,6 +179,15 @@ class NewsControllerTest < Test::Unit::TestCase
     assert_equal User.find(2), comment.author
   end
   
+  def test_empty_comment_should_not_be_added
+    @request.session[:user_id] = 2
+    assert_no_difference 'Comment.count' do
+      post :add_comment, :id => 1, :comment => { :comments => '' }
+      assert_response :success
+      assert_template 'show'
+    end
+  end
+  
   def test_destroy_comment
     comments_count = News.find(1).comments.size
     @request.session[:user_id] = 2