diff options
| author | Nathan Kinkade <nath@nkinka.de> | 2012-11-29 17:41:07 +0000 |
|---|---|---|
| committer | Nathan Kinkade <nath@nkinka.de> | 2012-11-29 17:41:07 +0000 |
| commit | fc7750c742d30c6ebd42a12c9d468f54e90d470d (patch) | |
| tree | e971591cf8497246a05db3d9793e8fb610610a56 /modules | |
| parent | a12ede0a39515b7b97aa8a3415f60d1c9752e3e6 (diff) | |
| parent | f457cd283cdfd9011d76ae96872e1f08bb219baf (diff) | |
Merge branch 'master' of git://github.com/gallery/gallery3
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/gallery/helpers/gallery_installer.php | 11 | ||||
| -rw-r--r-- | modules/gallery/libraries/ORM_MPTT.php | 3 | ||||
| -rw-r--r-- | modules/gallery/module.info | 2 |
3 files changed, 13 insertions, 3 deletions
diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php index e556b49a..99bc3726 100644 --- a/modules/gallery/helpers/gallery_installer.php +++ b/modules/gallery/helpers/gallery_installer.php @@ -312,8 +312,9 @@ class gallery_installer { module::set_var("gallery", "show_user_profiles_to", "registered_users"); module::set_var("gallery", "extra_binary_paths", "/usr/local/bin:/opt/local/bin:/opt/bin"); module::set_var("gallery", "timezone", null); + module::set_var("gallery", "lock_timeout", 1); - module::set_version("gallery", 50); + module::set_version("gallery", 51); } static function upgrade($version) { @@ -713,6 +714,14 @@ class gallery_installer { } module::set_version("gallery", $version = 50); } + + if ($version == 50) { + // In v50, a lock_timeout variable was added so that administrators could edit the time out + // 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); + } } static function uninstall() { diff --git a/modules/gallery/libraries/ORM_MPTT.php b/modules/gallery/libraries/ORM_MPTT.php index 534dd13b..ce0b102c 100644 --- a/modules/gallery/libraries/ORM_MPTT.php +++ b/modules/gallery/libraries/ORM_MPTT.php @@ -324,7 +324,8 @@ class ORM_MPTT_Core extends ORM { * Lock the tree to prevent concurrent modification. */ protected function lock() { - $result = $this->db->query("SELECT GET_LOCK('{$this->table_name}', 1) AS l")->current(); + $timeout = module::get_var("gallery", "lock_timeout"); + $result = $this->db->query("SELECT GET_LOCK('{$this->table_name}', $timeout) AS l")->current(); if (empty($result->l)) { throw new Exception("@todo UNABLE_TO_LOCK_EXCEPTION"); } diff --git a/modules/gallery/module.info b/modules/gallery/module.info index a905a241..424c0c2d 100644 --- a/modules/gallery/module.info +++ b/modules/gallery/module.info @@ -1,6 +1,6 @@ name = "Gallery 3" description = "Gallery core application" -version = 50 +version = 51 author_name = "Gallery Team" author_url = "http://codex.gallery2.org/Gallery:Team" info_url = "http://codex.gallery2.org/Gallery3:Modules:gallery" |