Make it all at least work.

git-svn-id: http://svn.simon-cozens.org/memories/trunk@54 041978f6-d955-411f-a9d7-1d8545c9c3c7

diff --git a/Memories/Photo.pm b/Memories/Photo.pm
index a92280782c721af1d6e04987d5861d9981d9d7dd..9e922f3daa3212c1de7b3e01a1763d89ad4b3358 100644 (file)
--- a/Memories/Photo.pm
+++ b/Memories/Photo.pm
@@ -1,5 +1,5 @@
 package Memories::Photo;
-use Apache2::Upload;
+#use Apache2::Upload;
 use File::Basename;
 use File::Copy;
 use Archive::Any;
@@ -128,10 +128,10 @@ sub upload_raw {
     $filename =~ /\.(.*)$/;
     my $format = $1;
     # Put the file in place
+    my $photo = $self->upload_jpeg($r, $jpg, $offered_name);
     $photo->format($format);
     copy($filename, 
          Memories->config->{data_store}."/".$photo->id.".".$format);
-    my $photo = $self->upload_jpeg($r, $jpg, $offered_name);
     return $photo;
 }