diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2011-04-29 07:10:27 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2011-04-29 07:10:27 +0000 |
| commit | 8a734f9997f80279fe82ccd2dc99179be4253317 (patch) | |
| tree | 5e3cf6f9d3395c6812ae2bb925caaba2ac7abc38 | |
| parent | d60949ca87f486d521b1a00c4de38b9cbf531819 (diff) | |
| download | redmine-8a734f9997f80279fe82ccd2dc99179be4253317.tar.gz redmine-8a734f9997f80279fe82ccd2dc99179be4253317.zip | |
Merged r5157 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.1-stable@5574 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/models/changeset.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |