From 3f1d769ffc5b8a7e719500986ee557e16e518ba8 Mon Sep 17 00:00:00 2001
From: Damien Churchill <damoc@gmail.com>
Date: Tue, 20 Oct 2009 21:44:27 +0000
Subject: [PATCH] merge changes into trunk

---
 deluge/ui/web/js/Deluge.MultiOptionsManager.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/deluge/ui/web/js/Deluge.MultiOptionsManager.js b/deluge/ui/web/js/Deluge.MultiOptionsManager.js
index 5b12a54fd..a052d6885 100644
--- a/deluge/ui/web/js/Deluge.MultiOptionsManager.js
+++ b/deluge/ui/web/js/Deluge.MultiOptionsManager.js
@@ -75,7 +75,13 @@ Deluge.MultiOptionsManager = Ext.extend(Deluge.OptionsManager, {
 	 */
 	get: function() {
 		var id = arguments[0];
-		if (arguments.length == 2) {
+		if (arguments.length == 1) {
+			var options = {};
+			for (var option in this.options) {
+				options[option] = (this.isDirty(id, option)) ? this.changed[id][option] : this.getDefault(id, option);
+			}
+			return options;
+		} else if (arguments.length == 2) {
 			var option = arguments[1];
 			return (this.isDirty(id, option)) ? this.changed[id][option] : this.getDefault(id, option);
 		} else {