# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1310554788 -3600
# Node ID f6ed606887bc1d4c4e47ab19fd633b6a898904cd
# Parent  970f46489d295c1e7471786bfdea44d40cdb4408# Parent  eef2e2ed53c9b69cb06508271e84087ae7b4ae95
Merge

diff -r 970f46489d29 -r f6ed606887bc app/controllers/issues_controller.rb
--- a/app/controllers/issues_controller.rb	Wed Jul 13 11:08:16 2011 +0100
+++ b/app/controllers/issues_controller.rb	Wed Jul 13 11:59:48 2011 +0100
@@ -301,7 +301,7 @@
     # is in this issues watcher's list
     # if not, adds it.
 
-    if params[:issue][:assigned_to_id] && !params[:issue][:assigned_to_id].empty?:
+    if params[:issue] && params[:issue][:assigned_to_id] && !params[:issue][:assigned_to_id].empty?:
      unless @issue.watched_by?(User.find(params[:issue][:assigned_to_id])):
        @issue.add_watcher(User.find(params[:issue][:assigned_to_id]))
      end