Merge branch 'master' into talmdal_dev

3 files changed, 8 insertions, 2 deletions

diff --git a/modules/gallery/controllers/packager.php b/modules/gallery/controllers/packager.php
index 82c3c938..1354a01b 100644
--- a/modules/gallery/controllers/packager.php
+++ b/modules/gallery/controllers/packager.php
@@ -134,6 +134,11 @@ class Packager_Controller extends Controller {
         $line = preg_replace("/ENGINE=\S+ /", "", $line);
       }
 
+      // Null out ids in the vars table since it's an auto_increment table and this will result in
+      // more stable values so we'll have less churn in install.sql.
+      $line = preg_replace(
+        "/^INSERT INTO {vars} VALUES \(\d+/", "INSERT INTO {vars} VALUES (NULL", $line);
+
       $buf .= $line;
     }
     $fd = fopen($sql_file, "wb");
diff --git a/modules/gallery/helpers/block_manager.php b/modules/gallery/helpers/block_manager.php
index b003f1d8..978ef9ba 100644
--- a/modules/gallery/helpers/block_manager.php
+++ b/modules/gallery/helpers/block_manager.php
@@ -37,7 +37,7 @@ class block_manager_Core {
     $block_class = "{$module_name}_block";
     if (method_exists($block_class, "get_site_list")) {
       $blocks = call_user_func(array($block_class, "get_site_list"));
-      foreach  (array_keys($blocks) as $block_id) {
+      foreach (array_keys($blocks) as $block_id) {
         self::add("site_sidebar", $module_name, $block_id);
       }
     }
diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index 39859b36..410b6413 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -268,7 +268,8 @@ class gallery_installer {
     module::set_var("gallery", "show_credits", 1);
     // @todo this string needs to be picked up by l10n_scanner
     module::set_var("gallery", "credits", "Powered by <a href=\"%url\">Gallery %version</a>");
-    module::set_version("gallery", 19);
+    module::set_var("gallery", "simultaneous_upload_limit", 5);
+    module::set_version("gallery", 21);
   }
 
   static function upgrade($version) {