Merge branch 'master' of git://github.com/gallery/gallery3

1 files changed, 6 insertions, 2 deletions

diff --git a/modules/gallery/controllers/uploader.php b/modules/gallery/controllers/uploader.php
index 20c10b3a..4ea55ff6 100644
--- a/modules/gallery/controllers/uploader.php
+++ b/modules/gallery/controllers/uploader.php
@@ -63,6 +63,10 @@ class Uploader_Controller extends Controller {
         $item->parent_id = $album->id;
         $item->set_data_file($temp_filename);
 
+        // Remove double extensions from the filename - they'll be disallowed in the model but if
+        // we don't do it here then it'll result in a failed upload.
+        $item->name = legal_file::smash_extensions($item->name);
+
         $path_info = @pathinfo($temp_filename);
         if (array_key_exists("extension", $path_info) &&
             in_array(strtolower($path_info["extension"]), array("flv", "mp4", "m4v"))) {
@@ -104,8 +108,8 @@ class Uploader_Controller extends Controller {
       // The "errors" won't be properly pluralized :-/
       print t2("Uploaded %count photo (%error errors)",
                "Uploaded %count photos (%error errors)",
-               $success_count,
-               array("error" => $error_count));
+               (int)$success_count,
+               array("error" => (int)$error_count));
     } else {
       print t2("Uploaded %count photo", "Uploaded %count photos", $success_count);}
   }