From 8a734f9997f80279fe82ccd2dc99179be4253317 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Fri, 29 Apr 2011 07:10:27 +0000 Subject: [PATCH] Merged r5157 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.1-stable@5574 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/changeset.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/changeset.rb b/app/models/changeset.rb index 86fc144ac..1faad1d35 100644 --- a/app/models/changeset.rb +++ b/app/models/changeset.rb @@ -185,7 +185,7 @@ class Changeset < ActiveRecord::Base return nil if id.blank? issue = Issue.find_by_id(id.to_i, :include => :project) if issue - unless project == issue.project || project.is_ancestor_of?(issue.project) || project.is_descendant_of?(issue.project) + unless issue.project && (project == issue.project || project.is_ancestor_of?(issue.project) || project.is_descendant_of?(issue.project)) issue = nil end end