Index: branches/RC/core/admin_templates/js/uploader/upload_manager.js
===================================================================
diff -u -r10625 -r10627
--- branches/RC/core/admin_templates/js/uploader/upload_manager.js	(.../upload_manager.js)	(revision 10625)
+++ branches/RC/core/admin_templates/js/uploader/upload_manager.js	(.../upload_manager.js)	(revision 10627)
@@ -1,18 +1,4 @@
-function UploadsManager($use_toolbar) {
-	// hooking to standard toolbar select button to peform auto-upload when Save is clicked
-	if (!isset($use_toolbar)) {
-		$use_toolbar = true;
-	}
-
-	if ($use_toolbar && isset(a_toolbar))	{
-		if (a_toolbar.ButtonExists('select')) {
-			var old_onclick = a_toolbar.Buttons['select'].onClick;
-			a_toolbar.Buttons['select'].onClick = function() {
-				UploadsManager.UploadAll(function() {old_onclick()});
-			}
-		}
-	}
-
+function UploadsManager() {
 	addLoadEvent(
 		function() {
 			UploadsManager._initAll();
@@ -28,6 +14,7 @@
 UploadsManager._Uploaders = new Object();
 
 /* ==== Public Attributes ==== */
+UploadsManager.useToolbar = false;
 UploadsManager.formContainerId = '';
 UploadsManager.useTransparency = true;
 
@@ -46,6 +33,8 @@
 }
 
 UploadsManager._initAll = function() {
+	this._createHooks();
+
 	for (var i in this._Uploaders) {
 		this._Uploaders[i].init();
 	}
@@ -74,6 +63,20 @@
 	return null;
 }
 
+UploadsManager._createHooks = function () {
+	// hooking to standard toolbar select button to peform auto-upload when Save is clicked
+	if (!UploadsManager.useToolbar || !isset(a_toolbar)) {
+		return ;
+	}
+
+	if (a_toolbar.ButtonExists('select')) {
+		var old_onclick = a_toolbar.Buttons['select'].onClick;
+		a_toolbar.Buttons['select'].onClick = function() {
+			UploadsManager.UploadAll(function() {old_onclick()});
+		}
+	}
+}
+
 /* ==== Public methods ==== */
 UploadsManager.AddUploader = function(id, params) {
 	this._Uploaders[id] = new Uploader(id, params);