PLT-3269 Moved formatting toggle behind EnableDeveloper setting (#3402)

* Force formatting to be enabled if testing is disabled

* Moved formatting toggle behind EnableDeveloper setting

2 files changed, 2 insertions, 2 deletions

diff --git a/webapp/components/user_settings/user_settings_advanced.jsx b/webapp/components/user_settings/user_settings_advanced.jsx
index 35ab77256..37a7a894f 100644
--- a/webapp/components/user_settings/user_settings_advanced.jsx
+++ b/webapp/components/user_settings/user_settings_advanced.jsx
@@ -140,7 +140,7 @@ export default class AdvancedSettingsDisplay extends React.Component {
     }
 
     renderFormattingSection() {
-        if (window.mm_config.EnableTesting === 'false') {
+        if (window.mm_config.EnableDeveloper === 'false') {
             return null;
         }
 
diff --git a/webapp/utils/text_formatting.jsx b/webapp/utils/text_formatting.jsx
index 7f4328dc9..91be443fc 100644
--- a/webapp/utils/text_formatting.jsx
+++ b/webapp/utils/text_formatting.jsx
@@ -27,7 +27,7 @@ export function formatText(text, options = {}) {
     let output = text;
 
     // would probably make more sense if it was on the calling components, but this option is intended primarily for debugging
-    if (PreferenceStore.get(Constants.Preferences.CATEGORY_ADVANCED_SETTINGS, 'formatting', 'true') === 'false') {
+    if (window.mm_config.EnableDeveloper === 'true' && PreferenceStore.get(Constants.Preferences.CATEGORY_ADVANCED_SETTINGS, 'formatting', 'true') === 'false') {
         return output;
     }