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

23 files changed, 122 insertions, 102 deletions

diff --git a/.htaccess b/.htaccess
index 08b9c5bb..c3f94237 100644
--- a/.htaccess
+++ b/.htaccess
@@ -44,6 +44,11 @@
 #
 # Then just use your Gallery 3 without the index.php in the url.
 #
+# NOTE: future upgrades of Gallery 3 will overwrite this file!  If you
+# want these changes to be persistent, you should talk to your system
+# administrator about putting this block into your Apache config
+# files.
+#
 # <IfModule mod_rewrite.c>
 #   RewriteEngine On
 #   RewriteBase /
diff --git a/installer/install.sql b/installer/install.sql
index 48b504ba..21464379 100755
--- a/installer/install.sql
+++ b/installer/install.sql
@@ -11,7 +11,7 @@ CREATE TABLE {access_caches} (
   `edit_2` binary(1) NOT NULL default '0',
   `add_2` binary(1) NOT NULL default '0',
   PRIMARY KEY  (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+) AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
 SET character_set_client = @saved_cs_client;
 INSERT INTO {access_caches} VALUES (1,1,'1','0','0','1','0','0');
 DROP TABLE IF EXISTS {access_intents};
@@ -29,7 +29,7 @@ CREATE TABLE {access_intents} (
   `edit_2` binary(1) default NULL,
   `add_2` binary(1) default NULL,
   PRIMARY KEY  (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+) AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
 SET character_set_client = @saved_cs_client;
 INSERT INTO {access_intents} VALUES (1,1,'1','1','0','0','1','1','0','0');
 DROP TABLE IF EXISTS {caches};
@@ -43,7 +43,7 @@ CREATE TABLE {caches} (
   `cache` longblob,
   PRIMARY KEY  (`id`),
   KEY `tags` (`tags`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) DEFAULT CHARSET=utf8;
 SET character_set_client = @saved_cs_client;
 DROP TABLE IF EXISTS {comments};
 SET @saved_cs_client     = @@character_set_client;
@@ -72,7 +72,7 @@ CREATE TABLE {comments} (
   `text` text,
   `updated` int(9) NOT NULL,
   PRIMARY KEY  (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) DEFAULT CHARSET=utf8;
 SET character_set_client = @saved_cs_client;
 DROP TABLE IF EXISTS {graphics_rules};
 SET @saved_cs_client     = @@character_set_client;
@@ -86,7 +86,7 @@ CREATE TABLE {graphics_rules} (
   `priority` int(9) NOT NULL,
   `target` varchar(32) NOT NULL,
   PRIMARY KEY  (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
+) AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
 SET character_set_client = @saved_cs_client;
 INSERT INTO {graphics_rules} VALUES (1,1,'a:3:{s:5:\"width\";i:200;s:6:\"height\";i:200;s:6:\"master\";i:2;}','gallery','resize',100,'thumb');
 INSERT INTO {graphics_rules} VALUES (2,1,'a:3:{s:5:\"width\";i:640;s:6:\"height\";i:480;s:6:\"master\";i:2;}','gallery','resize',100,'resize');
@@ -99,7 +99,7 @@ CREATE TABLE {groups} (
   `special` tinyint(1) default '0',
   PRIMARY KEY  (`id`),
   UNIQUE KEY `name` (`name`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
+) AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
 SET character_set_client = @saved_cs_client;
 INSERT INTO {groups} VALUES (1,'Everybody',1);
 INSERT INTO {groups} VALUES (2,'Registered Users',1);
@@ -111,7 +111,7 @@ CREATE TABLE {groups_users} (
   `user_id` int(9) NOT NULL,
   PRIMARY KEY  (`group_id`,`user_id`),
   UNIQUE KEY `user_id` (`user_id`,`group_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) DEFAULT CHARSET=utf8;
 SET character_set_client = @saved_cs_client;
 INSERT INTO {groups_users} VALUES (1,1);
 INSERT INTO {groups_users} VALUES (1,2);
@@ -129,7 +129,7 @@ CREATE TABLE {incoming_translations} (
   PRIMARY KEY  (`id`),
   UNIQUE KEY `key` (`key`,`locale`),
   KEY `locale_key` (`locale`,`key`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) DEFAULT CHARSET=utf8;
 SET character_set_client = @saved_cs_client;
 DROP TABLE IF EXISTS {items};
 SET @saved_cs_client     = @@character_set_client;
@@ -171,7 +171,7 @@ CREATE TABLE {items} (
   KEY `type` (`type`),
   KEY `random` (`rand_key`),
   KEY `weight` (`weight`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+) AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
 SET character_set_client = @saved_cs_client;
 INSERT INTO {items} VALUES (1,NULL,NULL,UNIX_TIMESTAMP(),'',NULL,1,1,NULL,NULL,NULL,0,NULL,'',1,NULL,NULL,2,'weight','ASC',1,NULL,NULL,'Gallery','album',UNIX_TIMESTAMP(),0,1,NULL,'1','1');
 DROP TABLE IF EXISTS {items_tags};
@@ -184,7 +184,7 @@ CREATE TABLE {items_tags} (
   PRIMARY KEY  (`id`),
   KEY `tag_id` (`tag_id`,`id`),
   KEY `item_id` (`item_id`,`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) DEFAULT CHARSET=utf8;
 SET character_set_client = @saved_cs_client;
 DROP TABLE IF EXISTS {logs};
 SET @saved_cs_client     = @@character_set_client;
@@ -200,7 +200,7 @@ CREATE TABLE {logs} (
   `url` varchar(255) default NULL,
   `user_id` int(9) default '0',
   PRIMARY KEY  (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) DEFAULT CHARSET=utf8;
 SET character_set_client = @saved_cs_client;
 DROP TABLE IF EXISTS {messages};
 SET @saved_cs_client     = @@character_set_client;
@@ -212,7 +212,7 @@ CREATE TABLE {messages} (
   `value` varchar(255) default NULL,
   PRIMARY KEY  (`id`),
   UNIQUE KEY `key` (`key`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) DEFAULT CHARSET=utf8;
 SET character_set_client = @saved_cs_client;
 DROP TABLE IF EXISTS {modules};
 SET @saved_cs_client     = @@character_set_client;
@@ -224,7 +224,7 @@ CREATE TABLE {modules} (
   `version` int(9) default NULL,
   PRIMARY KEY  (`id`),
   UNIQUE KEY `name` (`name`)
-) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8;
+) AUTO_INCREMENT=10 DEFAULT CHARSET=utf8;
 SET character_set_client = @saved_cs_client;
 INSERT INTO {modules} VALUES (1,1,'gallery',10);
 INSERT INTO {modules} VALUES (2,1,'user',1);
@@ -248,7 +248,7 @@ CREATE TABLE {outgoing_translations} (
   PRIMARY KEY  (`id`),
   UNIQUE KEY `key` (`key`,`locale`),
   KEY `locale_key` (`locale`,`key`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) DEFAULT CHARSET=utf8;
 SET character_set_client = @saved_cs_client;
 DROP TABLE IF EXISTS {permissions};
 SET @saved_cs_client     = @@character_set_client;
@@ -259,7 +259,7 @@ CREATE TABLE {permissions} (
   `name` varchar(64) default NULL,
   PRIMARY KEY  (`id`),
   UNIQUE KEY `name` (`name`)
-) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8;
+) AUTO_INCREMENT=5 DEFAULT CHARSET=utf8;
 SET character_set_client = @saved_cs_client;
 INSERT INTO {permissions} VALUES (1,'View','view');
 INSERT INTO {permissions} VALUES (2,'View Full Size','view_full');
@@ -276,7 +276,7 @@ CREATE TABLE {search_records} (
   PRIMARY KEY  (`id`),
   KEY `item_id` (`item_id`),
   FULLTEXT KEY `data` (`data`)
-) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+) AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
 SET character_set_client = @saved_cs_client;
 INSERT INTO {search_records} VALUES (1,1,0,'  Gallery');
 DROP TABLE IF EXISTS {sessions};
@@ -287,7 +287,7 @@ CREATE TABLE {sessions} (
   `data` text NOT NULL,
   `last_activity` int(10) unsigned NOT NULL,
   PRIMARY KEY  (`session_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) DEFAULT CHARSET=utf8;
 SET character_set_client = @saved_cs_client;
 DROP TABLE IF EXISTS {tags};
 SET @saved_cs_client     = @@character_set_client;
@@ -298,7 +298,7 @@ CREATE TABLE {tags} (
   `count` int(10) unsigned NOT NULL default '0',
   PRIMARY KEY  (`id`),
   UNIQUE KEY `name` (`name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) DEFAULT CHARSET=utf8;
 SET character_set_client = @saved_cs_client;
 DROP TABLE IF EXISTS {tasks};
 SET @saved_cs_client     = @@character_set_client;
@@ -316,7 +316,7 @@ CREATE TABLE {tasks} (
   `updated` int(9) default NULL,
   PRIMARY KEY  (`id`),
   KEY `owner_id` (`owner_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) DEFAULT CHARSET=utf8;
 SET character_set_client = @saved_cs_client;
 DROP TABLE IF EXISTS {themes};
 SET @saved_cs_client     = @@character_set_client;
@@ -327,7 +327,7 @@ CREATE TABLE {themes} (
   `version` int(9) default NULL,
   PRIMARY KEY  (`id`),
   UNIQUE KEY `name` (`name`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
+) AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
 SET character_set_client = @saved_cs_client;
 INSERT INTO {themes} VALUES (1,'default',1);
 INSERT INTO {themes} VALUES (2,'admin_default',1);
@@ -350,7 +350,7 @@ CREATE TABLE {users} (
   PRIMARY KEY  (`id`),
   UNIQUE KEY `name` (`name`),
   UNIQUE KEY `hash` (`hash`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
+) AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
 SET character_set_client = @saved_cs_client;
 INSERT INTO {users} VALUES (1,'guest','Guest User','',0,0,NULL,0,1,NULL,NULL,NULL);
 INSERT INTO {users} VALUES (2,'admin','Gallery Administrator','',0,0,NULL,1,0,NULL,NULL,NULL);
@@ -364,7 +364,7 @@ CREATE TABLE {vars} (
   `value` text,
   PRIMARY KEY  (`id`),
   UNIQUE KEY `module_name` (`module_name`,`name`)
-) ENGINE=InnoDB AUTO_INCREMENT=27 DEFAULT CHARSET=utf8;
+) AUTO_INCREMENT=27 DEFAULT CHARSET=utf8;
 SET character_set_client = @saved_cs_client;
 INSERT INTO {vars} VALUES (1,'gallery','active_site_theme','default');
 INSERT INTO {vars} VALUES (2,'gallery','active_admin_theme','admin_default');
diff --git a/lib/gallery.show_full_size.js b/lib/gallery.show_full_size.js
index 2f365f0d..7e826c32 100644
--- a/lib/gallery.show_full_size.js
+++ b/lib/gallery.show_full_size.js
@@ -10,7 +10,7 @@
      $("body").append('<div id="gFullsizeOverlay" class="ui-dialog-overlay" ' +
 		      'style="border: none; margin: 0; padding: 0; background-color: #000; ' +
 		      'position: absolute; top: 0px; left: 0px; ' +
-		      'width: ' + size.width() + 'px; height: ' + size.height() + 'px;' +
+		      'width: ' + width + 'px; height: ' + height + 'px;' +
                       ' opacity: 0.7; filter: alpha(opacity=70);' +
 		      '-moz-background-clip: -moz-initial; -moz-background-origin: -moz-initial; ' +
 		      '-moz-background-inline-policy: -moz-initial; z-index: 1001;"> </div>');
@@ -27,23 +27,22 @@
 		      '<img id="gFullSizeImage" src="' + image_url + '"' +
 		      'height="' + image_size.height + '" width="' + image_size.width + '"/></div>');
 
-     $("#gFullsize").append('<span id="gFullsizeClose" class="fg-button ui-icon ui-state-default ' +
-			    'ui-icon-closethick ui-corner-all" style="z-index: 1003; position: absolute; ' +
-			    'right: 1em; top: 1em;"></span>');
-     $("#gFullsizeClose").click(function() {
-				  $("#gFullsizeOverlay*").remove();
-				  $("#gFullsize").remove();
-				});
+     $().click(function() {
+       $("#gFullsizeOverlay*").remove();
+       $("#gFullsize").remove();
+     });
+     $().bind("keypress", function() {
+       $("#gFullsizeOverlay*").remove();
+       $("#gFullsize").remove();
+     });
      $(window).resize(function() {
-			$("#gFullsizeOverlay").width($(document).width())
-			  .height($(document).height());
-			image_size = $.gallery_auto_fit_window(image_width, image_height);
-			$("#gFullsize").height(image_size.height)
-			  .width(image_size.width)
-			  .css("top", image_size.top)
-			  .css("left", image_size.left);
-			$("#gFullSizeImage").height(image_size.height)
-			  .width(image_size.width);
-		      });
+       $("#gFullsizeOverlay").width($(document).width()).height($(document).height());
+       image_size = $.gallery_auto_fit_window(image_width, image_height);
+       $("#gFullsize").height(image_size.height)
+	 .width(image_size.width)
+	 .css("top", image_size.top)
+	 .css("left", image_size.left);
+       $("#gFullSizeImage").height(image_size.height).width(image_size.width);
+     });
    };
 })(jQuery);
diff --git a/modules/comment/helpers/comment_installer.php b/modules/comment/helpers/comment_installer.php
index edf2427c..80594c16 100644
--- a/modules/comment/helpers/comment_installer.php
+++ b/modules/comment/helpers/comment_installer.php
@@ -44,7 +44,7 @@ class comment_installer {
                  `text` text,
                  `updated` int(9) NOT NULL,
                PRIMARY KEY (`id`))
-               ENGINE=InnoDB DEFAULT CHARSET=utf8;");
+               DEFAULT CHARSET=utf8;");
 
     block_manager::add("dashboard_center", "comment", "recent_comments");
     module::set_var("comment", "spam_caught", 0);
diff --git a/modules/digibug/helpers/digibug_installer.php b/modules/digibug/helpers/digibug_installer.php
index 1cd78b44..7e8145d2 100644
--- a/modules/digibug/helpers/digibug_installer.php
+++ b/modules/digibug/helpers/digibug_installer.php
@@ -26,7 +26,7 @@ class digibug_installer {
                 `request_date` TIMESTAMP NOT NULL DEFAULT current_timestamp,
                 `item_id` int(9) NOT NULL,
                PRIMARY KEY (`id`))
-               ENGINE=InnoDB DEFAULT CHARSET=utf8;");
+               DEFAULT CHARSET=utf8;");
 
     module::set_var("digibug", "company_id", "3153");
     module::set_var("digibug", "event_id", "8491");
diff --git a/modules/exif/helpers/exif_installer.php b/modules/exif/helpers/exif_installer.php
index 0233f2bb..66226061 100644
--- a/modules/exif/helpers/exif_installer.php
+++ b/modules/exif/helpers/exif_installer.php
@@ -28,7 +28,7 @@ class exif_installer {
                  `dirty` BOOLEAN default 1,
                  PRIMARY KEY (`id`),
                  KEY(`item_id`))
-               ENGINE=InnoDB DEFAULT CHARSET=utf8;");
+               DEFAULT CHARSET=utf8;");
     module::set_version("exif", 1);
   }
 
diff --git a/modules/g2_import/helpers/g2_import_installer.php b/modules/g2_import/helpers/g2_import_installer.php
index 0f87da6c..feacb518 100644
--- a/modules/g2_import/helpers/g2_import_installer.php
+++ b/modules/g2_import/helpers/g2_import_installer.php
@@ -26,7 +26,7 @@ class g2_import_installer {
                  `g3_id` int(9) NOT NULL,
                PRIMARY KEY (`id`),
                KEY (`g2_id`))
-               ENGINE=InnoDB DEFAULT CHARSET=utf8;");
+               DEFAULT CHARSET=utf8;");
 
     module::set_version("g2_import", 1);
     mkdir(VARPATH . "modules/g2_import");
diff --git a/modules/gallery/controllers/packager.php b/modules/gallery/controllers/packager.php
index 7b4d68f6..fbb1d07d 100644
--- a/modules/gallery/controllers/packager.php
+++ b/modules/gallery/controllers/packager.php
@@ -123,6 +123,10 @@ class Packager_Controller extends Controller {
       // Normalize dates
       $line = preg_replace("/,$root_created_timestamp,/", ",UNIX_TIMESTAMP(),", $line);
       $line = preg_replace("/,$root_updated_timestamp,/", ",UNIX_TIMESTAMP(),", $line);
+
+      // Remove ENGINE= specifications
+      $line = preg_replace("/ENGINE=\S+ /", "", $line);
+
       $buf .= $line;
     }
     $fd = fopen($sql_file, "wb");
diff --git a/modules/gallery/controllers/simple_uploader.php b/modules/gallery/controllers/simple_uploader.php
index e7c0bd6f..156d18ac 100644
--- a/modules/gallery/controllers/simple_uploader.php
+++ b/modules/gallery/controllers/simple_uploader.php
@@ -71,7 +71,7 @@ class Simple_Uploader_Controller extends Controller {
           unlink($temp_filename);
         }
         header("HTTP/1.1 500 Internal Server Error");
-        print "ERROR:" . $e->getMessage();
+        print "ERROR: " . $e->getMessage();
         return;
       }
       unlink($temp_filename);
diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index d12dad70..a212ef85 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -24,13 +24,13 @@ class gallery_installer {
                  `id` int(9) NOT NULL auto_increment,
                  `item_id` int(9),
                  PRIMARY KEY (`id`))
-               ENGINE=InnoDB DEFAULT CHARSET=utf8;");
+               DEFAULT CHARSET=utf8;");
 
     $db->query("CREATE TABLE {access_intents} (
                  `id` int(9) NOT NULL auto_increment,
                  `item_id` int(9),
                  PRIMARY KEY (`id`))
-               ENGINE=InnoDB DEFAULT CHARSET=utf8;");
+               DEFAULT CHARSET=utf8;");
 
     $db->query("CREATE TABLE {caches} (
                 `id` int(9) NOT NULL auto_increment,
@@ -40,7 +40,7 @@ class gallery_installer {
                 `cache` longblob,
                 PRIMARY KEY (`id`),
                 KEY (`tags`))
-                ENGINE=InnoDB DEFAULT CHARSET=utf8;");
+                DEFAULT CHARSET=utf8;");
 
     $db->query("CREATE TABLE {graphics_rules} (
                  `id` int(9) NOT NULL auto_increment,
@@ -51,7 +51,7 @@ class gallery_installer {
                  `priority` int(9) NOT NULL,
                  `target`  varchar(32) NOT NULL,
                  PRIMARY KEY (`id`))
-               ENGINE=InnoDB DEFAULT CHARSET=utf8;");
+               DEFAULT CHARSET=utf8;");
 
     $db->query("CREATE TABLE {incoming_translations} (
                  `id` int(9) NOT NULL auto_increment,
@@ -63,7 +63,7 @@ class gallery_installer {
                  PRIMARY KEY (`id`),
                  UNIQUE KEY(`key`, `locale`),
                  KEY `locale_key` (`locale`, `key`))
-               ENGINE=InnoDB DEFAULT CHARSET=utf8;");
+               DEFAULT CHARSET=utf8;");
 
     $db->query("CREATE TABLE {items} (
                  `id` int(9) NOT NULL auto_increment,
@@ -100,7 +100,7 @@ class gallery_installer {
                  KEY `type` (`type`),
                  KEY `random` (`rand_key`),
                  KEY `weight` (`weight` DESC))
-               ENGINE=InnoDB DEFAULT CHARSET=utf8;");
+               DEFAULT CHARSET=utf8;");
 
     $db->query("CREATE TABLE {logs} (
                  `id` int(9) NOT NULL auto_increment,
@@ -113,7 +113,7 @@ class gallery_installer {
                  `url` varchar(255) default NULL,
                  `user_id` int(9) default 0,
                  PRIMARY KEY (`id`))
-               ENGINE=InnoDB DEFAULT CHARSET=utf8;");
+               DEFAULT CHARSET=utf8;");
 
     $db->query("CREATE TABLE {messages} (
                  `id` int(9) NOT NULL auto_increment,
@@ -122,7 +122,7 @@ class gallery_installer {
                  `value` varchar(255) default NULL,
                  PRIMARY KEY (`id`),
                  UNIQUE KEY(`key`))
-               ENGINE=InnoDB DEFAULT CHARSET=utf8;");
+               DEFAULT CHARSET=utf8;");
 
     $db->query("CREATE TABLE {modules} (
                  `id` int(9) NOT NULL auto_increment,
@@ -131,7 +131,7 @@ class gallery_installer {
                  `version` int(9) default NULL,
                  PRIMARY KEY (`id`),
                  UNIQUE KEY(`name`))
-               ENGINE=InnoDB DEFAULT CHARSET=utf8;");
+               DEFAULT CHARSET=utf8;");
 
     $db->query("CREATE TABLE {outgoing_translations} (
                  `id` int(9) NOT NULL auto_increment,
@@ -143,7 +143,7 @@ class gallery_installer {
                  PRIMARY KEY (`id`),
                  UNIQUE KEY(`key`, `locale`),
                  KEY `locale_key` (`locale`, `key`))
-               ENGINE=InnoDB DEFAULT CHARSET=utf8;");
+               DEFAULT CHARSET=utf8;");
 
     $db->query("CREATE TABLE {permissions} (
                  `id` int(9) NOT NULL auto_increment,
@@ -151,14 +151,14 @@ class gallery_installer {
                  `name` varchar(64) default NULL,
                  PRIMARY KEY (`id`),
                  UNIQUE KEY(`name`))
-               ENGINE=InnoDB DEFAULT CHARSET=utf8;");
+               DEFAULT CHARSET=utf8;");
 
     $db->query("CREATE TABLE {sessions} (
                 `session_id` varchar(127) NOT NULL,
                 `data` text NOT NULL,
                 `last_activity` int(10) UNSIGNED NOT NULL,
                 PRIMARY KEY (`session_id`))
-               ENGINE=InnoDB DEFAULT CHARSET=utf8;");
+               DEFAULT CHARSET=utf8;");
 
     $db->query("CREATE TABLE {tasks} (
                 `id` int(9) NOT NULL auto_increment,
@@ -173,7 +173,7 @@ class gallery_installer {
                 `updated` int(9) default NULL,
                 PRIMARY KEY (`id`),
                 KEY (`owner_id`))
-               ENGINE=InnoDB DEFAULT CHARSET=utf8;");
+               DEFAULT CHARSET=utf8;");
 
     $db->query("CREATE TABLE {themes} (
                  `id` int(9) NOT NULL auto_increment,
@@ -181,7 +181,7 @@ class gallery_installer {
                  `version` int(9) default NULL,
                  PRIMARY KEY (`id`),
                  UNIQUE KEY(`name`))
-               ENGINE=InnoDB DEFAULT CHARSET=utf8;");
+               DEFAULT CHARSET=utf8;");
 
     $db->query("CREATE TABLE {vars} (
                 `id` int(9) NOT NULL auto_increment,
@@ -190,7 +190,7 @@ class gallery_installer {
                 `value` text,
                 PRIMARY KEY (`id`),
                 UNIQUE KEY(`module_name`, `name`))
-               ENGINE=InnoDB DEFAULT CHARSET=utf8;");
+               DEFAULT CHARSET=utf8;");
 
     foreach (array("albums", "logs", "modules", "resizes", "thumbs", "tmp", "uploads") as $dir) {
       @mkdir(VARPATH . $dir);
@@ -284,7 +284,7 @@ class gallery_installer {
                  `cache` text,
                  PRIMARY KEY (`id`),
                  KEY (`tags`))
-                 ENGINE=InnoDB DEFAULT CHARSET=utf8;");
+                 DEFAULT CHARSET=utf8;");
       module::set_version("gallery", $version = 4);
     }
 
diff --git a/modules/gallery/helpers/photo.php b/modules/gallery/helpers/photo.php
index 5cf37de1..96a66d29 100644
--- a/modules/gallery/helpers/photo.php
+++ b/modules/gallery/helpers/photo.php
@@ -109,8 +109,12 @@ class photo_Core {
     // there's only one save() happening here.
     module::event("item_created", $photo);
 
-    // Build our thumbnail/resizes
-    graphics::generate($photo);
+    // Build our thumbnail/resizes.  If we fail to build thumbnail/resize we assume that the image
+    // is bad in some way and discard it.
+    if (!graphics::generate($photo)) {
+      $photo->delete();
+      throw new Exception("@todo BAD_IMAGE_FILE");
+    }
 
     // If the parent has no cover item, make this it.
     if (access::can("edit", $parent) && $parent->album_cover_item_id == null)  {
diff --git a/modules/gallery/libraries/I18n.php b/modules/gallery/libraries/I18n.php
index b1b4298a..d0531b9a 100644
--- a/modules/gallery/libraries/I18n.php
+++ b/modules/gallery/libraries/I18n.php
@@ -79,9 +79,9 @@ class I18n_Core {
       $locale_prefs[] = 'en_US';
       $new_locale = setlocale(LC_ALL, $locale_prefs);
       if (is_string($new_locale) && strpos($new_locale, 'tr') === 0) {
-	// Make PHP 5 work with Turkish (the localization results are mixed though).
-	// Hack for http://bugs.php.net/18556
-	setlocale(LC_CTYPE, 'C');
+        // Make PHP 5 work with Turkish (the localization results are mixed though).
+        // Hack for http://bugs.php.net/18556
+        setlocale(LC_CTYPE, 'C');
       }
     }
     return $this->_config['default_locale'];
@@ -183,7 +183,7 @@ class I18n_Core {
   static function is_plural_message($message) {
     return is_array($message);
   }
-  
+
   private function interpolate($locale, $string, $values) {
     // TODO: Handle locale specific number formatting.
 
diff --git a/modules/gallery/views/simple_uploader.html.php b/modules/gallery/views/simple_uploader.html.php
index 38ac518c..29a0dfe8 100644
--- a/modules/gallery/views/simple_uploader.html.php
+++ b/modules/gallery/views/simple_uploader.html.php
@@ -218,7 +218,7 @@
     var fp = new File_Progress(file);
     switch (error_code) {
     case SWFUpload.UPLOAD_ERROR.HTTP_ERROR:
-      fp.set_status("error", "<?= t("Upload error: ") ?>" + message);
+      fp.set_status("error", "<?= t("Upload error: bad image file") ?>");
       break;
     case SWFUpload.UPLOAD_ERROR.UPLOAD_FAILED:
       fp.set_status("error", "<?= t("Upload failed") ?>");
diff --git a/modules/info/views/info_block.html.php b/modules/info/views/info_block.html.php
index f86ae39d..3c668168 100644
--- a/modules/info/views/info_block.html.php
+++ b/modules/info/views/info_block.html.php
@@ -10,9 +10,9 @@
      <?= nl2br(p::purify($item->description)) ?>
   </li>
   <? endif ?>
-  <? if ($item->id != 1): ?>
+  <? if (!$item->is_album()): ?>
   <li>
-    <strong class="caption"><?= t("Folder name:") ?></strong>
+    <strong class="caption"><?= t("File name:") ?></strong>
     <?= p::clean($item->name) ?>
   </li>
   <? endif ?>
diff --git a/modules/notification/helpers/notification_installer.php b/modules/notification/helpers/notification_installer.php
index 3d450258..aa2e09f7 100644
--- a/modules/notification/helpers/notification_installer.php
+++ b/modules/notification/helpers/notification_installer.php
@@ -27,14 +27,14 @@ class notification_installer {
                PRIMARY KEY (`id`),
                UNIQUE KEY (`item_id`, `user_id`),
                UNIQUE KEY (`user_id`, `item_id`))
-               ENGINE=InnoDB DEFAULT CHARSET=utf8;");
+               DEFAULT CHARSET=utf8;");
     $db->query("CREATE TABLE IF NOT EXISTS {pending_notifications} (
                `id` int(9) NOT NULL auto_increment,
                `email` varchar(128) NOT NULL,
                `subject` varchar(255) NOT NULL,
                `text` text,
                PRIMARY KEY (`id`))
-               ENGINE=InnoDB DEFAULT CHARSET=utf8;");
+               DEFAULT CHARSET=utf8;");
 
     module::set_version("notification", 1);
   }
diff --git a/modules/search/helpers/search_installer.php b/modules/search/helpers/search_installer.php
index cd253be4..10d8211f 100644
--- a/modules/search/helpers/search_installer.php
+++ b/modules/search/helpers/search_installer.php
@@ -28,7 +28,7 @@ class search_installer {
                  PRIMARY KEY (`id`),
                  KEY(`item_id`),
                  FULLTEXT INDEX (`data`))
-               ENGINE=MyISAM DEFAULT CHARSET=utf8;");
+               DEFAULT CHARSET=utf8;");
     module::set_version("search", 1);
   }
 
diff --git a/modules/server_add/controllers/server_add.php b/modules/server_add/controllers/server_add.php
index bfb96506..26b3bd08 100644
--- a/modules/server_add/controllers/server_add.php
+++ b/modules/server_add/controllers/server_add.php
@@ -220,19 +220,25 @@ class Server_Add_Controller extends Admin_Controller {
           $album = album::create($parent, $name, $title, null, $owner_id);
           $entry->item_id = $album->id;
         } else {
-          $extension = strtolower(pathinfo($name, PATHINFO_EXTENSION));
-          if (in_array($extension, array("gif", "png", "jpg", "jpeg"))) {
-            $photo = photo::create($parent, $entry->file, $name, $title, null, $owner_id);
-            $entry->item_id = $photo->id;
-          } else if (in_array($extension, array("flv", "mp4"))) {
-            $movie = movie::create($parent, $entry->file, $name, $title, null, $owner_id);
-            $entry->item_id = $movie->id;
-          } else {
-            // This should never happen, because we don't add stuff to the list that we can't
-            // process.  But just in, case.. set this to a non-null value so that we skip this
-            // entry.
+          try {
+            $extension = strtolower(pathinfo($name, PATHINFO_EXTENSION));
+            if (in_array($extension, array("gif", "png", "jpg", "jpeg"))) {
+              $photo = photo::create($parent, $entry->file, $name, $title, null, $owner_id);
+              $entry->item_id = $photo->id;
+            } else if (in_array($extension, array("flv", "mp4"))) {
+              $movie = movie::create($parent, $entry->file, $name, $title, null, $owner_id);
+              $entry->item_id = $movie->id;
+            } else {
+              // This should never happen, because we don't add stuff to the list that we can't
+              // process.  But just in, case.. set this to a non-null value so that we skip this
+              // entry.
+              $entry->item_id = 0;
+              $task->log("Skipping unknown file type: $entry->file");
+            }
+          } catch (Exception $e) {
+            // This can happen if a photo file is invalid, like a BMP masquerading as a .jpg
             $entry->item_id = 0;
-            $task->log("Skipping unknown file type: $entry->file");
+            $task->log("Skipping invalid file: $entry->file");
           }
         }
 
diff --git a/modules/server_add/helpers/server_add_installer.php b/modules/server_add/helpers/server_add_installer.php
index cd278eb7..c3c1572d 100644
--- a/modules/server_add/helpers/server_add_installer.php
+++ b/modules/server_add/helpers/server_add_installer.php
@@ -27,7 +27,7 @@ class server_add_installer {
                   `parent_id` int(9),
                   `task_id` int(9) NOT NULL,
                   PRIMARY KEY (`id`))
-                ENGINE=InnoDB DEFAULT CHARSET=utf8;");
+                DEFAULT CHARSET=utf8;");
     module::set_version("server_add", 3);
     server_add::check_config();
   }
@@ -40,7 +40,7 @@ class server_add_installer {
                     `task_id` int(9) NOT NULL,
                     `file` varchar(255) NOT NULL,
                     PRIMARY KEY (`id`))
-                  ENGINE=InnoDB DEFAULT CHARSET=utf8;");
+                  DEFAULT CHARSET=utf8;");
       module::set_version("server_add", $version = 2);
     }
 
diff --git a/modules/slideshow/helpers/slideshow_event.php b/modules/slideshow/helpers/slideshow_event.php
index cf79f71a..1b881de4 100644
--- a/modules/slideshow/helpers/slideshow_event.php
+++ b/modules/slideshow/helpers/slideshow_event.php
@@ -31,13 +31,17 @@ class slideshow_event_Core {
   }
 
   static function album_menu($menu, $theme) {
-    $menu
-      ->append(Menu::factory("link")
-               ->id("slideshow")
-               ->label(t("View slideshow"))
-               ->url("javascript:PicLensLite.start(" .
-                     "{maxScale:0,feedUrl:PicLensLite.indexFeeds()[0].url})")
-               ->css_id("gSlideshowLink"));
+    $descendants_count = ORM::factory("item", $theme->item->id)
+      ->descendants_count(array("type" => "photo"));
+    if ($descendants_count > 1) {
+      $menu
+        ->append(Menu::factory("link")
+                 ->id("slideshow")
+                 ->label(t("View slideshow"))
+                 ->url("javascript:PicLensLite.start(" .
+                       "{maxScale:0,feedUrl:PicLensLite.indexFeeds()[0].url})")
+                 ->css_id("gSlideshowLink"));
+    }
   }
 
   static function photo_menu($menu, $theme) {
diff --git a/modules/tag/helpers/tag_installer.php b/modules/tag/helpers/tag_installer.php
index 3c16e3f3..bcb830e4 100644
--- a/modules/tag/helpers/tag_installer.php
+++ b/modules/tag/helpers/tag_installer.php
@@ -26,7 +26,7 @@ class tag_installer {
                  `count` int(10) unsigned NOT NULL DEFAULT 0,
                  PRIMARY KEY (`id`),
                  UNIQUE KEY(`name`))
-               ENGINE=InnoDB DEFAULT CHARSET=utf8;");
+               DEFAULT CHARSET=utf8;");
 
     $db->query("CREATE TABLE IF NOT EXISTS {items_tags} (
                  `id` int(9) NOT NULL auto_increment,
@@ -35,7 +35,7 @@ class tag_installer {
                  PRIMARY KEY (`id`),
                  KEY(`tag_id`, `id`),
                  KEY(`item_id`, `id`))
-               ENGINE=InnoDB DEFAULT CHARSET=utf8;");
+               DEFAULT CHARSET=utf8;");
     module::set_version("tag", 1);
   }
 
diff --git a/modules/user/controllers/password.php b/modules/user/controllers/password.php
index 2af1b879..7c432701 100644
--- a/modules/user/controllers/password.php
+++ b/modules/user/controllers/password.php
@@ -29,8 +29,6 @@ class Password_Controller extends Controller {
   }
 
   public function do_reset() {
-    access::verify_csrf();
-
     if (request::method() == "post") {
       $this->_change_password();
     } else {
diff --git a/modules/user/helpers/user_installer.php b/modules/user/helpers/user_installer.php
index 1959d038..8ef4f13d 100644
--- a/modules/user/helpers/user_installer.php
+++ b/modules/user/helpers/user_installer.php
@@ -36,7 +36,7 @@ class user_installer {
                  PRIMARY KEY (`id`),
                  UNIQUE KEY(`hash`),
                  UNIQUE KEY(`name`))
-               ENGINE=InnoDB DEFAULT CHARSET=utf8;");
+               DEFAULT CHARSET=utf8;");
 
     $db->query("CREATE TABLE IF NOT EXISTS {groups} (
                  `id` int(9) NOT NULL auto_increment,
@@ -44,14 +44,14 @@ class user_installer {
                  `special` BOOLEAN default 0,
                  PRIMARY KEY (`id`),
                  UNIQUE KEY(`name`))
-               ENGINE=InnoDB DEFAULT CHARSET=utf8;");
+               DEFAULT CHARSET=utf8;");
 
     $db->query("CREATE TABLE IF NOT EXISTS {groups_users} (
                  `group_id` int(9) NOT NULL,
                  `user_id` int(9) NOT NULL,
                  PRIMARY KEY (`group_id`, `user_id`),
                  UNIQUE KEY(`user_id`, `group_id`))
-               ENGINE=InnoDB DEFAULT CHARSET=utf8;");
+               DEFAULT CHARSET=utf8;");
 
     $everybody = group::create("Everybody");
     $everybody->special = true;
diff --git a/modules/watermark/helpers/watermark_installer.php b/modules/watermark/helpers/watermark_installer.php
index 705b89d4..b3e91044 100644
--- a/modules/watermark/helpers/watermark_installer.php
+++ b/modules/watermark/helpers/watermark_installer.php
@@ -30,7 +30,7 @@ class watermark_installer {
                  `mime_type` varchar(64) default NULL,
                  PRIMARY KEY (`id`),
                  UNIQUE KEY(`name`))
-               ENGINE=InnoDB DEFAULT CHARSET=utf8;");
+               DEFAULT CHARSET=utf8;");
 
     @mkdir(VARPATH . "modules/watermark");
     module::set_version("watermark", 1);