@@ -158,7 +158,7 @@ class PeopleController < ApplicationController end @mine = Conference.upcoming_for_person(@user) - @can_define_nametag = @user and @user.has_admin_task?('sys_conf_adm') + @can_define_nametag = (@user and @user.has_admin_task?('sys_conf_adm')) end # General personal information @@ -301,6 +301,7 @@ class PeopleController < ApplicationController end def process_photo(person, photo) + return nil if !photo or photo.is_a? String begin person.photo.destroy if person.has_photo? person_photo = person.build_photo app/controllers/people_controller.rb f335a1ddd28501de199f44b8f6d6a0fcc88ada13 Gunnar Wolf gwolf@gwolf.org http://github.com/gwolf/comas/commit/1d5e292768c901369a57ab31fa8ea1e0965e499e 1d5e292768c901369a57ab31fa8ea1e0965e499e 2009-10-01T12:37:12-07:00 2009-10-01T12:37:12-07:00 Two further small bugs squished 5a72c96f3c87ac699cb957794aa965fd77b156ce Gunnar Wolf gwolf@gwolf.org