From 45b2f90a31d208463fa5e7a584f5ef73bda9e8b7 Mon Sep 17 00:00:00 2001
From: David Bienvenu <bienvenu@nventure.com>
Date: Sun, 21 Sep 2008 15:21:07 -0700
Subject: [PATCH] bug 453943, always disable js for mailnews for 3.0 b1, don't
 load pref, r=bz, sr=dmose

---
 caps/src/nsScriptSecurityManager.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/caps/src/nsScriptSecurityManager.cpp b/caps/src/nsScriptSecurityManager.cpp
index ac5844b85a0..a08d6d9b3b9 100644
--- a/caps/src/nsScriptSecurityManager.cpp
+++ b/caps/src/nsScriptSecurityManager.cpp
@@ -1708,8 +1708,7 @@ nsScriptSecurityManager::CanExecuteScripts(JSContext* cx,
             if (NS_FAILED(rv)) return rv;
             if (appType == nsIDocShell::APP_TYPE_MAIL) 
             {
-                // we are temporarily disabling js in mail for TB 3.0 b1
-                *result = PR_FALSE; // mIsMailJavaScriptEnabled;
+                *result = mIsMailJavaScriptEnabled;
             }
         }
     }
@@ -3786,7 +3785,8 @@ nsScriptSecurityManager::ScriptSecurityPrefChanged()
 
     rv = mSecurityPref->SecurityGetBoolPref(sJSMailEnabledPrefName, &temp);
     // JavaScript in Mail defaults to disabled in failure cases.
-    mIsMailJavaScriptEnabled = NS_SUCCEEDED(rv) && temp;
+    // disable javascript in mailnews for TB 3.0 beta1
+    mIsMailJavaScriptEnabled = PR_FALSE; // NS_SUCCEEDED(rv) && temp;
 
     rv = mSecurityPref->SecurityGetBoolPref(sFileOriginPolicyPrefName, &temp);
     sStrictFileOriginPolicy = NS_SUCCEEDED(rv) && temp;