From d096a639d6d51c02b71c243dc8b1b29f94a73007 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Tue, 27 Jan 2015 13:14:07 -0500
Subject: [PATCH] fixed #2657 -- there's a slight chance this might break other
 ACP pages, but my limited testing tells me it is ok so far

---
 public/src/modules/settings.js | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/public/src/modules/settings.js b/public/src/modules/settings.js
index b31975c1ab..66b76fc4fd 100644
--- a/public/src/modules/settings.js
+++ b/public/src/modules/settings.js
@@ -457,6 +457,17 @@ define('settings', function () {
 					console.log('[settings] Unable to load settings for hash: ', hash);
 					return callback(err);
 				}
+				
+				// Parse all values. If they are json, return json
+				for(var key in values) {
+					if (values.hasOwnProperty(key)) {
+						try {
+							values[key] = JSON.parse(values[key]);
+						} catch (e) {
+							// Leave the value as is
+						}
+					}
+				}
 
 				$(formEl).deserialize(values);
 
@@ -474,6 +485,13 @@ define('settings', function () {
 						values[inputEl.attr('id')] = 'off';
 					}
 				});
+
+				// Normalizing value of multiple selects
+				formEl.find('select[multiple]').each(function(idx, selectEl) {
+					selectEl = $(selectEl);
+					values[selectEl.attr('id')] = JSON.stringify(selectEl.val());
+				});
+
 				socket.emit('admin.settings.set', {
 					hash: hash,
 					values: values