diff --git a/app/controllers/my_profile/cms_controller.rb b/app/controllers/my_profile/cms_controller.rb index bb7976c..e2bfd4e 100644 --- a/app/controllers/my_profile/cms_controller.rb +++ b/app/controllers/my_profile/cms_controller.rb @@ -303,7 +303,7 @@ class CmsController < MyProfileController files_uploaded << UploadedFile.create(:uploaded_data => file, :profile => profile, :parent => parent) unless file == '' end end - render :text => article_list_to_json(files_uploaded), :content_type => 'application/json' + render :text => article_list_to_json(files_uploaded), :content_type => 'text/plain' end protected diff --git a/test/functional/cms_controller_test.rb b/test/functional/cms_controller_test.rb index e74371e..7e36d56 100644 --- a/test/functional/cms_controller_test.rb +++ b/test/functional/cms_controller_test.rb @@ -1496,7 +1496,7 @@ class CmsControllerTest < Test::Unit::TestCase should 'upload media by AJAX' do post :media_upload, :profile => profile.identifier, :file1 => fixture_file_upload('/files/test.txt', 'text/plain'), :file2 => fixture_file_upload('/files/rails.png', 'image/png'), :file3 => '' assert_match 'test.txt', @response.body - assert_equal 'application/json', @response.content_type + assert_equal 'text/plain', @response.content_type data = parse_json_response @@ -1523,7 +1523,7 @@ class CmsControllerTest < Test::Unit::TestCase post :media_upload, :profile => profile.identifier, :media_listing => true, :file1 => fixture_file_upload('files/rails.png', 'image/png'), :file2 => fixture_file_upload('/files/test.txt', 'text/plain') - assert_equal 'application/json', @response.content_type + assert_equal 'text/plain', @response.content_type data = parse_json_response assert_equal 'rails.png', data[0]['title'] -- libgit2 0.21.2