Merge branch 'master' of https://github.com/gallery/gallery3 into rawphoto

Conflicts:
	modules/gallery/helpers/system.php
	modules/gallery/tests/System_Helper_Test.php

1 files changed, 10 insertions, 0 deletions

diff --git a/modules/gallery/helpers/system.php b/modules/gallery/helpers/system.php
index 9815d588..d2e9c125 100644
--- a/modules/gallery/helpers/system.php
+++ b/modules/gallery/helpers/system.php
@@ -47,6 +47,7 @@ class system_Core {
    * It allows the caller to specify a prefix and an extension.
    * It always places the file in TMPPATH.
    */
+<<<<<<< HEAD
   static function temp_filename($prefix = "", $extension = "") {
     return self::_tempnam(TMPPATH, $prefix, ".$extension", "tempnam");
   }
@@ -61,6 +62,15 @@ class system_Core {
         return false;
       }
       $filename = $basename . $postfix;
+=======
+  static function temp_filename($prefix="", $extension="") {
+    do {
+      $basename = tempnam(TMPPATH, $prefix);
+      if (!$basename) {
+        return false;
+      }
+      $filename = "$basename.$extension";
+>>>>>>> db734130c5fe10408040b2326b28b102f3131271
       $success = !file_exists($filename) && @rename($basename, $filename);
       if (!$success) {
         @unlink($basename);