diff --git a/js/mage/adminhtml/flexuploader.js b/js/mage/adminhtml/flexuploader.js index 6f59d36487e..7a10a5779c6 100644 --- a/js/mage/adminhtml/flexuploader.js +++ b/js/mage/adminhtml/flexuploader.js @@ -213,7 +213,7 @@ if(!window.Flex) { document.cookie = escape(response.cookie.name) + "=" + escape(response.cookie.value) - + "; expires=" + date.toGMTString() + + "; expires=" + date.toUTCString() + (response.cookie.path.blank() ? "" : "; path=" + response.cookie.path) + (response.cookie.domain.blank() ? "" : "; domain=" + response.cookie.domain); } diff --git a/js/mage/adminhtml/tools.js b/js/mage/adminhtml/tools.js index e756dd3fcad..22f40dc5b10 100644 --- a/js/mage/adminhtml/tools.js +++ b/js/mage/adminhtml/tools.js @@ -525,7 +525,7 @@ var Cookie = { if (cookieLifeTime) { var date = new Date(); date.setTime(date.getTime()+(cookieLifeTime*1000)); - expires = '; expires='+date.toGMTString(); + expires = '; expires='+date.toUTCString(); } var urlPath = '/' + BASE_URL.split('/').slice(3).join('/'); // Get relative path document.cookie = escape(cookieName) + "=" + escape(cookieValue) + expires + "; path=" + urlPath; diff --git a/js/mage/cookies.js b/js/mage/cookies.js index e21974b89d0..b2f6a5e4074 100644 --- a/js/mage/cookies.js +++ b/js/mage/cookies.js @@ -39,7 +39,7 @@ Mage.Cookies.set = function(name, value){ var domain = (argc > 4) ? argv[4] : Mage.Cookies.domain; var secure = (argc > 5) ? argv[5] : Mage.Cookies.secure; document.cookie = name + "=" + escape (value) + - ((expires == null) ? "" : ("; expires=" + expires.toGMTString())) + + ((expires == null) ? "" : ("; expires=" + expires.toUTCString())) + ((path == null) ? "" : ("; path=" + path)) + ((domain == null) ? "" : ("; domain=" + domain)) + ((secure == true) ? "; secure" : ""); diff --git a/js/prototype/window.js b/js/prototype/window.js index c684f79b3e5..80b606cdff0 100644 --- a/js/prototype/window.js +++ b/js/prototype/window.js @@ -1817,7 +1817,7 @@ var WindowUtilities = { setCookie: function(value, parameters) { document.cookie= parameters[0] + "=" + escape(value) + - ((parameters[1]) ? "; expires=" + parameters[1].toGMTString() : "") + + ((parameters[1]) ? "; expires=" + parameters[1].toUTCString() : "") + ((parameters[2]) ? "; path=" + parameters[2] : "") + ((parameters[3]) ? "; domain=" + parameters[3] : "") + ((parameters[4]) ? "; secure" : "");