Merge pull request #2019 from MushroomObserver/xxx

Added some diagnostics.

app/models/image.rb

@@ -545,6 +545,7 @@ def input_stream?(file)
 
   def init_image_from_local_file(file)
     @file = file
+    raise("Weird: file.path is blank!") if file.path.blank?
     self.upload_temp_file = file.path
     self.upload_length    = file.size
     add_extra_attributes_from_file(file)
@@ -667,7 +668,7 @@ def validate_image_name
   # to the :image field.  Returns true if the file is successfully saved.
   def save_to_temp_file
     result = true
-    unless upload_temp_file
+    unless upload_temp_file.present?
 
       # Image is supplied in a input stream.  This can happen in a variety of
       # cases, including during testing, and also when the image comes in as
@@ -702,7 +703,8 @@ def save_to_temp_file
       else
         errors.add(:image, "Unexpected error: did not receive a valid upload " \
                            "stream from the webserver (we got an instance of " \
-                           "#{upload_handle.class.name}).  Please try again.")
+                           "#{upload_handle.class.name}). Send this to the " \
+                           "webmaster, please.  Backtrace: #{caller[0..20]}...")
         result = false
       end
     end

config/locales/en.txt

@@ -3622,7 +3622,7 @@
   validate_user_email_missing: Please give us a valid email address so we can verify your [:account].
   validate_user_email_mismatch: Your email addresses don't match.  Please check for a typo.
   validate_user_login_taken: Sorry, that login name is already taken.
-  validate_image_wrong_type: The file "[file]" is not a valid image; it is comes through as '[type]'.
+  validate_image_wrong_type: The file "[file]" is not a valid image; it comes through as '[type]'.
   validate_invalid_lifeform: "Invalid lifeform word(s): [words].  We are strictly enforcing which types are allowed.  If you would like us to add support to additional lifeforms, please contact the admins and make your case."
 
   # These shouldn't need translating, but you are free to override if you need to.