diff --git a/release/src/router/www/Advanced_System_Content.asp b/release/src/router/www/Advanced_System_Content.asp index 87f2353c83a..cb530ef99c4 100644 --- a/release/src/router/www/Advanced_System_Content.asp +++ b/release/src/router/www/Advanced_System_Content.asp @@ -918,11 +918,14 @@ function corrected_timezone(){ var today = new Date(); var StrIndex; var timezone = uptimeStr_update.substring(26,31); - - if(today.toString().lastIndexOf("-") > 0) - StrIndex = today.toString().lastIndexOf("-"); - else if(today.toString().lastIndexOf("+") > 0) - StrIndex = today.toString().lastIndexOf("+"); + var startPos = today.toString().indexOf("("); + if ( startPos < 0 ) + startPos = today.toString().length; + + if(today.toString().lastIndexOf("-", startPos) > 0) + StrIndex = today.toString().lastIndexOf("-", startPos); + else if(today.toString().lastIndexOf("+", startPos) > 0) + StrIndex = today.toString().lastIndexOf("+", startPos); if(StrIndex > 0){ //alert('dstoffset='+dstoffset+', 設定時區='+timezone+' , 當地時區='+today.toString().substring(StrIndex, StrIndex+5)) diff --git a/release/src/router/www/state.js b/release/src/router/www/state.js index 7588d178b3e..2cd589fa463 100644 --- a/release/src/router/www/state.js +++ b/release/src/router/www/state.js @@ -3620,10 +3620,14 @@ function switchType(obj, showText, chkBox){ function corrected_timezone(){ var today = new Date(); var StrIndex; - if(today.toString().lastIndexOf("-") > 0) - StrIndex = today.toString().lastIndexOf("-"); - else if(today.toString().lastIndexOf("+") > 0) - StrIndex = today.toString().lastIndexOf("+"); + var StrIndex; + var startPos = today.toString().indexOf("("); + if ( startPos < 0 ) + startPos = today.toString().length; + if(today.toString().lastIndexOf("-", startPos) > 0) + StrIndex = today.toString().lastIndexOf("-", startPos); + else if(today.toString().lastIndexOf("+", startPos) > 0) + StrIndex = today.toString().lastIndexOf("+", startPos); if(StrIndex > 0){ if(timezone != today.toString().substring(StrIndex, StrIndex+5)){