diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-12-06 10:03:59 -0800 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-12-06 10:03:59 -0800 |
| commit | c603a446cd6e8aa54254178b4d19e920376aab9f (patch) | |
| tree | bc6aec5d61dc19baba723cdfe41fd3fd01bfde7c /modules/gallery/helpers | |
| parent | 8d234cb4f5c1e67fdad3aa6c8d316de34337d832 (diff) | |
| parent | 0bb742ef33fe8f4ab8f4745b94355dab36ccb6cb (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3
Diffstat (limited to 'modules/gallery/helpers')
| -rw-r--r-- | modules/gallery/helpers/block_manager.php | 2 | ||||
| -rw-r--r-- | modules/gallery/helpers/gallery_installer.php | 3 |
2 files changed, 3 insertions, 2 deletions
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) { |