From 4fe4326ed1b7b8e58f340eadf316204d30122ec0 Mon Sep 17 00:00:00 2001
From: danielvincent <danielgrippi@gmail.com>
Date: Mon, 20 Sep 2010 15:00:02 -0700
Subject: [PATCH] DG IZ photo uploading now works

---
 app/controllers/photos_controller.rb | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/app/controllers/photos_controller.rb b/app/controllers/photos_controller.rb
index 8fa7a3bdf..42b00007c 100644
--- a/app/controllers/photos_controller.rb
+++ b/app/controllers/photos_controller.rb
@@ -12,6 +12,7 @@ class PhotosController < ApplicationController
   def create
 
     album = Album.find_by_id params[:album_id]
+    puts params
 
     begin
 
@@ -102,13 +103,18 @@ class PhotosController < ApplicationController
 
   private
   def clean_hash(params)
-    return {
-      :photo => {
-        :caption   => params[:photo][:caption],
-      },
-      :album_id  => params[:album_id],
-      :user_file => params[:user_file]
-    }
+    if params[:photo]
+      return {
+        :photo => {
+          :caption   => params[:photo][:caption],
+        }
+      }
+    else
+      return{
+        :album_id  => params[:album_id],
+        :user_file => params[:user_file]
+      }
+    end
   end
 
 end