From e604d6e23ef6aa91f9ccebd3f9b9e66db66547c8 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Wed, 21 Jun 2017 09:51:54 -0400
Subject: [PATCH] closes #5768

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

diff --git a/public/src/modules/settings.js b/public/src/modules/settings.js
index 93583d6ed9..5dfa5def2e 100644
--- a/public/src/modules/settings.js
+++ b/public/src/modules/settings.js
@@ -470,6 +470,9 @@ define('settings', function () {
 					}
 				}
 
+				// Save loaded settings into ajaxify.data for use client-side
+				ajaxify.data.settings = values;
+
 				$(formEl).deserialize(values);
 				$(formEl).find('input[type="checkbox"]').each(function () {
 					$(this).parents('.mdl-switch').toggleClass('is-checked', $(this).is(':checked'));
@@ -510,6 +513,9 @@ define('settings', function () {
 					// Remove unsaved flag to re-enable ajaxify
 					app.flags._unsaved = false;
 
+					// Also save to local ajaxify.data
+					ajaxify.data.settings = values;
+
 					if (typeof callback === 'function') {
 						callback(err);
 					} else if (err) {