0
@@ -28,9 +28,11 @@ class PhotosController < ApplicationController
0
 
0
   def create
0
     if params[:photo].nil?
0
-      unless params[:commit] == "Cancel"
0
-        flash[:error] = "Your browser doesn't appear to support file uploading"
0
-      end
0
+      # This is mainly to prevent exceptions on iPhones.
0
+      flash[:error] = "Your browser doesn't appear to support file uploading"
0
+      redirect_to edit_person_url(current_person) and return
0
+    end
0
+    if params[:commit] == "Cancel"
0
       redirect_to edit_person_url(current_person) and return
0
     end
0
     person_data = { :person => current_person,

0
@@ -57,7 +57,7 @@ describe PhotosController do
0
     end
0
     
0
     it "should handle cancellation and doesn't report about problem" do
0
-      post :create, :commit => "Cancel"
0
+      post :create, :commit => "Cancel", :photo => { :uploaded_data => nil }
0
       response.should redirect_to(edit_person_url(@person))
0
       flash[:error].should be_nil
0
     end