Rename the "upload_limit" variable to "simultaneous_upload_limit" for

clarity, since it only limits concurrency not the number of actual uploads.

Move the default-setting code into the upgrader so that we avoid
creating the variable as a side-effect of the view (personal
preference to avoid side-effect code since it's led to problems in the
past).

1 files changed, 1 insertions, 7 deletions

diff --git a/modules/gallery/libraries/Form_Uploadify.php b/modules/gallery/libraries/Form_Uploadify.php
index 52fa45f0..9d76153d 100644
--- a/modules/gallery/libraries/Form_Uploadify.php
+++ b/modules/gallery/libraries/Form_Uploadify.php
@@ -45,13 +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"];
-    $upload_limit = module::get_var("gallery", "upload_limit");
-    if (empty($upload_limit)) {
-      $upload_limit = 5;
-      module::set_var("gallery", "upload_limit", 5);
-    }
-
-    $v->upload_limit = $upload_limit;
+    $v->simultaneous_upload_limit = module::get_var("gallery", "simultaneous_upload_limit");
     return $v;
   }