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/gallery/libraries | |
| parent | a12ede0a39515b7b97aa8a3415f60d1c9752e3e6 (diff) | |
| parent | f457cd283cdfd9011d76ae96872e1f08bb219baf (diff) | |
Merge branch 'master' of git://github.com/gallery/gallery3
Diffstat (limited to 'modules/gallery/libraries')
| -rw-r--r-- | modules/gallery/libraries/ORM_MPTT.php | 3 |
1 files changed, 2 insertions, 1 deletions
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"); } |