diff options
author | Bharat Mediratta <bharat@menalto.com> | 2013-01-24 18:14:28 -0500 |
---|---|---|
committer | Bharat Mediratta <bharat@menalto.com> | 2013-01-24 18:14:28 -0500 |
commit | 03535786307c60f0f79ce4f773c9c1a8e43826ed (patch) | |
tree | 5ef1329cfaea5ab43dd9d28cb8aa48c0a34e1eed /modules/gallery/helpers/gallery_installer.php | |
parent | 86a2759062ee3dbf93f4c17c7499e3f506035047 (diff) | |
parent | 98d09c3740f1c19e477a71bdb44791306d7bd05b (diff) |
Merge branch 'master' of github.com:gallery/gallery3
Diffstat (limited to 'modules/gallery/helpers/gallery_installer.php')
-rw-r--r-- | modules/gallery/helpers/gallery_installer.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php index 91c785f6..fe651a4e 100644 --- a/modules/gallery/helpers/gallery_installer.php +++ b/modules/gallery/helpers/gallery_installer.php @@ -718,14 +718,14 @@ class gallery_installer { if ($version == 50) { // In v51, we added a lock_timeout variable so that administrators could edit the time out - // from 1 second to a higher variable if their system runs concurrent parallel uploads for + // from 1 second to a higher variable if their system runs concurrent parallel uploads for // instance. module::set_var("gallery", "lock_timeout", 1); module::set_version("gallery", $version = 51); } if ($version == 51) { - // In v52, we added functions to the legal_file helper that map photo and movie file + // In v52, we added functions to the legal_file helper that map photo and movie file // extensions to their mime types (and allow extension of the list by other modules). During // this process, we correctly mapped m4v files to video/x-m4v, correcting a previous error // where they were mapped to video/mp4. This corrects the existing items. @@ -736,7 +736,7 @@ class gallery_installer { ->execute(); module::set_version("gallery", $version = 52); } - + if ($version == 52) { // In v53, we added the ability to change the default time used when extracting frames from // movies. Previously we hard-coded this at 3 seconds, so we use that as the default. |