Bug 601201: followup to ignore the devtools.console.enabled pref value (treat it as always-on), rather than changing it's default value, r=dolske, a=me

browser/app/profile/firefox.js

@@ -1042,10 +1042,8 @@ pref("services.sync.prefs.sync.spellchecker.dictionary", true);
 pref("services.sync.prefs.sync.xpinstall.whitelist.required", true);
 #endif
 
-// Enable the Error Console (for now, see bug 601201)
-pref("devtools.errorconsole.enabled", true);
-
-// disable the Inspector
+// Disable the error console and inspector
+pref("devtools.errorconsole.enabled", false);
 pref("devtools.inspector.enabled", false);
 
 // Whether the character encoding menu is under the main Firefox button. This

browser/base/content/browser.js

@@ -1582,7 +1582,8 @@ function delayedStartup(isLoadingBlank, mustLoadSidebar) {
   }
 
   // Enable Error Console?
-  let consoleEnabled = gPrefService.getBoolPref("devtools.errorconsole.enabled");
+  // XXX Temporarily always-enabled, see bug 601201
+  let consoleEnabled = true || gPrefService.getBoolPref("devtools.errorconsole.enabled");
   if (consoleEnabled) {
     document.getElementById("javascriptConsole").hidden = false;
     document.getElementById("key_errorConsole").removeAttribute("disabled");