We now do a check on photo deletion to ensure that any associated status messages are also deleted if now empty [Issue #1126]

app/controllers/photos_controller.rb

@@ -128,7 +128,12 @@ class PhotosController < ApplicationController
         format.html do
           flash[:notice] = I18n.t 'photos.destroy.notice'
           if photo.status_message_guid
+            if photo.status_message.empty?
+              photo.status_message.destroy
+              respond_with photo, :location => person_photos_path(current_user.person)
+            else
               respond_with photo, :location => post_path(photo.status_message)
+            end
           else
             respond_with photo, :location => person_photos_path(current_user.person)
           end

app/models/status_message.rb

@@ -136,12 +136,17 @@ class StatusMessage < Post
     formatted_message(:plain_text => true)
 	end
 
+  def empty?
+    self.text.blank? && self.photos == []
+  end
+
   protected
 
   def message_or_photos_present?
-    if self.text.blank? && self.photos == []
+    if self.blank?
       errors[:base] << 'Status message requires a message or at least one photo'
     end
   end
+
 end