Simplified the temp_filename implementation and removed the mocks.

1 files changed, 4 insertions, 11 deletions

diff --git a/modules/gallery/helpers/system.php b/modules/gallery/helpers/system.php
index 9815d588..e7e58a70 100644
--- a/modules/gallery/helpers/system.php
+++ b/modules/gallery/helpers/system.php
@@ -47,20 +47,13 @@ class system_Core {
    * It allows the caller to specify a prefix and an extension.
    * It always places the file in TMPPATH.
    */
-  static function temp_filename($prefix = "", $extension = "") {
-    return self::_tempnam(TMPPATH, $prefix, ".$extension", "tempnam");
-  }
-
-  /**
-   * This helper provides a dependency-injected implementation of tempnam.
-   */
-  static function _tempnam($dir, $prefix, $postfix, $builtin) {
+  static function temp_filename($prefix="", $extension="") {
     do {
-      $basename = call_user_func($builtin, $dir, $prefix);
+      $basename = tempnam(TMPPATH, $prefix);
       if (!$basename) {
         return false;
       }
-      $filename = $basename . $postfix;
+      $filename = "$basename.$extension";
       $success = !file_exists($filename) && @rename($basename, $filename);
       if (!$success) {
         @unlink($basename);
@@ -68,4 +61,4 @@ class system_Core {
     } while (!$success);
     return $filename;
   }
-}
\ No newline at end of file
+}