summaryrefslogtreecommitdiffstats
path: root/app/controllers/projects_controller.rb
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2007-05-07 16:57:42 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2007-05-07 16:57:42 +0000
commitd85f5518d903a660a3645747d5c47bb8cee1bf35 (patch)
tree261b9fef60c75886e7a3eba3f1f79e14f822a5fd /app/controllers/projects_controller.rb
parent8e24c6458da011009685bf2bdb9b28e21e1f9249 (diff)
downloadredmine-d85f5518d903a660a3645747d5c47bb8cee1bf35.tar.gz
redmine-d85f5518d903a660a3645747d5c47bb8cee1bf35.zip
Removed "Wiki edits" option in the activity view if the project has no wiki.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@517 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers/projects_controller.rb')
-rw-r--r--app/controllers/projects_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 971d0acd3..82468c21a 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -508,7 +508,7 @@ class ProjectsController < ApplicationController
@show_documents = 1
end
- unless params[:show_wiki_edits] == "0"
+ unless @project.wiki.nil? || params[:show_wiki_edits] == "0"
select = "#{WikiContent.versioned_table_name}.updated_on, #{WikiContent.versioned_table_name}.comments, " +
"#{WikiContent.versioned_table_name}.#{WikiContent.version_column}, #{WikiPage.table_name}.title"
joins = "LEFT JOIN #{WikiPage.table_name} ON #{WikiPage.table_name}.id = #{WikiContent.versioned_table_name}.page_id " +