summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/controllers/wikis_controller.rb2
-rw-r--r--test/functional/wikis_controller_test.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/wikis_controller.rb b/app/controllers/wikis_controller.rb
index 5c6c54e55..2cc8c2f04 100644
--- a/app/controllers/wikis_controller.rb
+++ b/app/controllers/wikis_controller.rb
@@ -25,7 +25,7 @@ class WikisController < ApplicationController
def destroy
if request.post? && params[:confirm] && @project.wiki
@project.wiki.destroy
- redirect_to settings_project_path(@project, :tab => 'wiki')
+ redirect_to project_path(@project)
end
end
end
diff --git a/test/functional/wikis_controller_test.rb b/test/functional/wikis_controller_test.rb
index 6eef2061a..be61c8277 100644
--- a/test/functional/wikis_controller_test.rb
+++ b/test/functional/wikis_controller_test.rb
@@ -40,7 +40,7 @@ class WikisControllerTest < Redmine::ControllerTest
@request.session[:user_id] = 1
post :destroy, :params => {:id => 1, :confirm => 1}
assert_redirected_to :controller => 'projects',
- :action => 'settings', :id => 'ecookbook', :tab => 'wiki'
+ :action => 'show', :id => 'ecookbook'
assert_nil Project.find(1).wiki
end