diff --git a/app/controllers/my_profile/cms_controller.rb b/app/controllers/my_profile/cms_controller.rb index 4c794b2..6bcc7a6 100644 --- a/app/controllers/my_profile/cms_controller.rb +++ b/app/controllers/my_profile/cms_controller.rb @@ -294,7 +294,7 @@ class CmsController < MyProfileController def search query = params[:q] - results = query.blank? ? [] : profile.articles.published.find_by_contents(query)[:results] + results = query.blank? ? [] : profile.articles.published.find_by_contents(query) render :text => article_list_to_json(results), :content_type => 'application/json' end def media_upload diff --git a/test/functional/cms_controller_test.rb b/test/functional/cms_controller_test.rb index a801976..9226edf 100644 --- a/test/functional/cms_controller_test.rb +++ b/test/functional/cms_controller_test.rb @@ -9,7 +9,6 @@ class CmsControllerTest < Test::Unit::TestCase fixtures :environments def setup - Test::Unit::TestCase::setup @controller = CmsController.new @request = ActionController::TestRequest.new @request.stubs(:ssl?).returns(true) -- libgit2 0.21.2