Fix extension-swapping code for files that have extensions that are

not 3 characters long.  Fixes #1845.

1 files changed, 12 insertions, 0 deletions

diff --git a/modules/gallery/helpers/legal_file.php b/modules/gallery/helpers/legal_file.php
index 6ec65e97..af6472ca 100644
--- a/modules/gallery/helpers/legal_file.php
+++ b/modules/gallery/helpers/legal_file.php
@@ -80,4 +80,16 @@ class legal_file_Core {
     module::event("legal_movie_types", $types_wrapper);
     return $types_wrapper->types;
   }
+
+  /**
+   * Convert the extension of a filename.  If the original filename has no
+   * extension, add the new one to the end.
+   */
+  static function change_extension($filename, $new_ext) {
+    if (strpos($filename, ".") === false) {
+      return "{$filename}.{$new_ext}";
+    } else {
+      return preg_replace("/\..*?$/", ".{$new_ext}", $filename);
+    }
+  }
 }