Cvascript detection was broken when you changed your setting from never

to autodetect. Fixes: #983614

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@8477 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/ChangeLog b/ChangeLog
index 93f5db3da9bd696742cfca89f760b6f3aea53b66..200fc8521fc3e02ec35da22a9eb6c1e2b7536140 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -169,6 +169,8 @@ Version 1.5.1 -- CVS
     Fixes #1085377.
   - Reuploaded newmail plugin sounds. Fixes files uploaded to cvs without binary 
     option.
+  - Changing your JavaScript preference required a re-login to work.
+    Fixes #983614.
 
 Version 1.5.0
 --------------------

diff --git a/functions/page_header.php b/functions/page_header.php
index 714d5af02abeec95f76cd17684488c7565fe04cf..621b55d1225425ed4cd446391bfea18c25a63f04 100644 (file)
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -160,7 +160,7 @@ function displayPageHeader($color, $mailbox, $xtra='', $session=false) {
     $session = 0;
     }
 
-    if($javascript_on) {
+    if( $javascript_on || strpos($xtra, 'new_js_autodetect_results.value') ) {
 
       switch ( $module ) {
         case 'src/read_body.php':