diff options
| -rw-r--r-- | core/controllers/simple_uploader.php | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/core/controllers/simple_uploader.php b/core/controllers/simple_uploader.php index 68eefd8a..67b86e7a 100644 --- a/core/controllers/simple_uploader.php +++ b/core/controllers/simple_uploader.php @@ -59,17 +59,23 @@ class Simple_Uploader_Controller extends Controller { } $temp_filename = upload::save("file"); - $title = substr(basename($temp_filename), 10); // Skip unique identifier Kohana adds - $path_info = pathinfo($temp_filename); - if (in_array(strtolower($path_info["extension"]), array("flv", "mp4"))) { - $movie = movie::create($album, $temp_filename, $title, $title); - log::success("content", t("Added a movie"), - html::anchor("movies/$movie->id", t("view movie"))); - } else { - $photo = photo::create($album, $temp_filename, $title, $title); - log::success("content", t("Added a photo"), - html::anchor("photos/$photo->id", t("view photo"))); + try { + $title = substr(basename($temp_filename), 10); // Skip unique identifier Kohana adds + $path_info = pathinfo($temp_filename); + if (in_array(strtolower($path_info["extension"]), array("flv", "mp4"))) { + $movie = movie::create($album, $temp_filename, $title, $title); + log::success("content", t("Added a movie"), + html::anchor("movies/$movie->id", t("view movie"))); + } else { + $photo = photo::create($album, $temp_filename, $title, $title); + log::success("content", t("Added a photo"), + html::anchor("photos/$photo->id", t("view photo"))); + } + } catch (Exception $e) { + unlink($temp_filename); + throw $e; } + unlink($temp_filename); } } |