Merged r19613 from trunk to 4.1-stable (#33183).

git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19614 e93f8b46-1217-0410-a6f0-8f06a7374b81

test/functional/users_controller_test.rb

@@ -443,6 +443,14 @@ class UsersControllerTest < Redmine::ControllerTest
     assert_response 404
   end
 
+  def test_edit_user_with_full_text_formatting_custom_field_should_not_fail
+    field = UserCustomField.find(4)
+    field.update_attribute :text_formatting, 'full'
+
+    get :edit, :params => {:id => 2}
+    assert_response :success
+  end
+
   def test_update
     ActionMailer::Base.deliveries.clear
     put :update, :params => {