diff --git a/app/controllers/public/profile_controller.rb b/app/controllers/public/profile_controller.rb index 09384fa..c5381f7 100644 --- a/app/controllers/public/profile_controller.rb +++ b/app/controllers/public/profile_controller.rb @@ -17,8 +17,11 @@ class ProfileController < PublicController end @tags = profile.article_tags unless profile.display_info_to?(user) - profile.visible? ? private_profile : invisible_profile - render :action => 'index', :status => 403 + if profile.visible? + private_profile + else + invisible_profile + end end end @@ -395,6 +398,7 @@ class ProfileController < PublicController def private_profile private_profile_partial_parameters + render :action => 'index', :status => 403 end def invisible_profile diff --git a/test/functional/admin_panel_controller_test.rb b/test/functional/admin_panel_controller_test.rb index 55db96c..01583c1 100644 --- a/test/functional/admin_panel_controller_test.rb +++ b/test/functional/admin_panel_controller_test.rb @@ -130,11 +130,6 @@ class AdminPanelControllerTest < ActionController::TestCase assert_equal "This is my new environment", Environment.default.message_for_disabled_enterprise end - should 'always use WYSIWYG' do - get :site_info - assert_tag :tag => "script", :content => /tinyMCE\.init/ - end - should 'set portal community' do e = Environment.default @controller.stubs(:environment).returns(e) diff --git a/test/functional/comment_controller_test.rb b/test/functional/comment_controller_test.rb index b23e3b2..c20f21d 100644 --- a/test/functional/comment_controller_test.rb +++ b/test/functional/comment_controller_test.rb @@ -314,7 +314,7 @@ class CommentControllerTest < ActionController::TestCase Time.stubs(:now).returns(now) xhr :post, :create, :profile => community.identifier, :id => page.id, :comment => {:body => 'Some comment...'}, :confirm => 'true' task = Task.last - assert_equal now.to_s, task.comment.created_at.to_s + assert_equal now.utc.to_s, task.comment.created_at.utc.to_s end should "render_target be nil in article with moderation" do -- libgit2 0.21.2