diff options
Diffstat (limited to 'modules/gallery/libraries')
| -rw-r--r-- | modules/gallery/libraries/Form_Uploadify.php | 1 | ||||
| -rw-r--r-- | modules/gallery/libraries/ORM_MPTT.php | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/modules/gallery/libraries/Form_Uploadify.php b/modules/gallery/libraries/Form_Uploadify.php index b1d9fa74..9d76153d 100644 --- a/modules/gallery/libraries/Form_Uploadify.php +++ b/modules/gallery/libraries/Form_Uploadify.php @@ -45,6 +45,7 @@ class Form_Uploadify_Core extends Form_Input { $v = new View("form_uploadify.html"); $v->album = $this->data["album"]; $v->script_data = $this->data["script_data"]; + $v->simultaneous_upload_limit = module::get_var("gallery", "simultaneous_upload_limit"); return $v; } diff --git a/modules/gallery/libraries/ORM_MPTT.php b/modules/gallery/libraries/ORM_MPTT.php index 0ec0a848..949ca48c 100644 --- a/modules/gallery/libraries/ORM_MPTT.php +++ b/modules/gallery/libraries/ORM_MPTT.php @@ -48,6 +48,7 @@ class ORM_MPTT_Core extends ORM { */ function add_to_parent($parent) { $this->lock(); + $parent->reload(); // Assume that the prior lock holder may have changed the parent try { // Make a hole in the parent for this new item @@ -97,6 +98,7 @@ class ORM_MPTT_Core extends ORM { } $this->lock(); + $this->reload(); // Assume that the prior lock holder may have changed this entry try { $this->db_builder ->update($this->table_name) @@ -248,6 +250,8 @@ class ORM_MPTT_Core extends ORM { $level_delta = ($target->level + 1) - $this->level; $this->lock(); + $this->reload(); // Assume that the prior lock holder may have changed this entry + $target->reload(); try { if ($level_delta) { // Update the levels for the to-be-moved items |