4 files changed, 24 insertions, 2 deletions
diff --git a/modules/gallery/config/locale.php b/modules/gallery/config/locale.php
index 13de9098..bce7fb49 100644
--- a/modules/gallery/config/locale.php
+++ b/modules/gallery/config/locale.php
@@ -32,7 +32,12 @@ $config['language'] = array('en_US', 'English_United States');
  * Locale timezone.  Set in 'Advanced' settings, falling back to the server's zone.
  * @see http://php.net/timezones
  */
-$config['timezone'] = module::get_var("gallery", "timezone", date_default_timezone_get());
+if (file_exists(VARPATH . "database.php")) {
+  $config['timezone'] = module::get_var("gallery", "timezone", date_default_timezone_get());
+} else {
+  // Gallery3 is not installed yet -- don't make module::get_var() calls.
+  $config['timezone'] = date_default_timezone_get();
+}
 
 // i18n settings
 
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);
diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index 807c88a7..1704ff6e 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -889,7 +889,7 @@ class Item_Model_Core extends ORM_MPTT {
       if ($this->is_movie()) {
         $legal_values = array("video/flv", "video/x-flv", "video/mp4");
       } if ($this->is_photo()) {
-        $legal_values = array("image/jpeg", "image/gif", "image/png", "image/tiff");
+        $legal_values = array("image/jpeg", "image/gif", "image/png");
       }
       break;
 
diff --git a/modules/gallery/tests/System_Helper_Test.php b/modules/gallery/tests/System_Helper_Test.php
index dfe5d9ab..4b395799 100644
--- a/modules/gallery/tests/System_Helper_Test.php
+++ b/modules/gallery/tests/System_Helper_Test.php
@@ -18,12 +18,17 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class System_Helper_Test extends Gallery_Unit_Test_Case {
+<<<<<<< HEAD
   public function temp_filename_random_test() {
+=======
+  public function temp_filename_test() {
+>>>>>>> db734130c5fe10408040b2326b28b102f3131271
     $filename = system::temp_filename("file", "ext");
     $this->assert_true(file_exists($filename), "File not created");
     unlink($filename);
     $this->assert_pattern($filename, "|/file.*\\.ext$|");
   }
+<<<<<<< HEAD
 
   public function tempnam_collision_test() {
     require_once('Mock_Built_In.php');
@@ -47,4 +52,6 @@ class System_Helper_Test extends Gallery_Unit_Test_Case {
     }
     $this->assert_false($filename, "Operation not aborted");
   }
+=======
+>>>>>>> db734130c5fe10408040b2326b28b102f3131271
 }