1 files changed, 7 insertions, 1 deletions
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index 0d1301d0627..3f802727560 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -42,15 +42,21 @@ module IssuesHelper
   end
 
   def url_for_issue(issue_id)
+    return "" if @project.nil?
+
     if @project.used_default_issues_tracker?
       url = project_issue_url project_id: @project, id: issue_id
     else
       url = Settings[:issues_tracker][@project.issues_tracker]["issues_url"]
-      url.gsub(':id', issue_id.to_s).gsub(':project_id', @project.id.to_s)
+      url.gsub(':id', issue_id.to_s)
+        .gsub(':project_id', @project.id.to_s)
+        .gsub(':issues_tracker_id', @project.issues_tracker_id.to_s)
     end
   end
 
   def title_for_issue(issue_id)
+    return "" if @project.nil?
+
     if @project.used_default_issues_tracker? && issue = @project.issues.where(id: issue_id).first
       issue.title
     else