Skip to content

Commit 327b6ce

Browse files
committed
MAGETWO-64281: Merge branch 'toUTCstring' of github.com:schmengler/magento2 into MAGETWO-64281
2 parents e3c955c + ead58ef commit 327b6ce

File tree

12 files changed

+13
-13
lines changed

12 files changed

+13
-13
lines changed

lib/web/legacy-build.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/web/mage/adminhtml/tools.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ var Cookie = {
248248
if (cookieLifeTime) {
249249
var date = new Date();
250250
date.setTime(date.getTime()+(cookieLifeTime*1000));
251-
expires = '; expires='+date.toGMTString();
251+
expires = '; expires='+date.toUTCString();
252252
}
253253
var urlPath = '/' + BASE_URL.split('/').slice(3).join('/'); // Get relative path
254254
document.cookie = escape(cookieName) + "=" + escape(cookieValue) + expires + "; path=" + urlPath;

lib/web/mage/cookies.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
secure = options.secure;
7979

8080
document.cookie = name + '=' + encodeURIComponent(value) +
81-
(expires ? '; expires=' + expires.toGMTString() : '') +
81+
(expires ? '; expires=' + expires.toUTCString() : '') +
8282
(path ? '; path=' + path : '') +
8383
(domain ? '; domain=' + domain : '') +
8484
(secure ? '; secure' : '');

lib/web/prototype/window.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1822,7 +1822,7 @@ var WindowUtilities = {
18221822

18231823
setCookie: function(value, parameters) {
18241824
document.cookie= parameters[0] + "=" + escape(value) +
1825-
((parameters[1]) ? "; expires=" + parameters[1].toGMTString() : "") +
1825+
((parameters[1]) ? "; expires=" + parameters[1].toUTCString() : "") +
18261826
((parameters[2]) ? "; path=" + parameters[2] : "") +
18271827
((parameters[3]) ? "; domain=" + parameters[3] : "") +
18281828
((parameters[4]) ? "; secure" : "");

lib/web/tiny_mce/classes/firebug/firebug-lite.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,7 @@ var firebug = {
463463
var exdate=new Date();
464464

465465
exdate.setTime(exdate.getTime()-1);
466-
document.cookie='FBLiteSettings=;expires='+exdate.toGMTString();
466+
document.cookie='FBLiteSettings=;expires='+exdate.toUTCString();
467467
location.reload(true);
468468
},
469469
readCookie: function() {
@@ -558,7 +558,7 @@ var firebug = {
558558

559559
exdate=new Date();
560560
exdate.setDate(exdate.getDate()+365);
561-
targetWindow.document.cookie='FBLiteSettings='+values+';expires='+exdate.toGMTString();
561+
targetWindow.document.cookie='FBLiteSettings='+values+';expires='+exdate.toUTCString();
562562
}
563563
},
564564
refreshForm: function() {

lib/web/tiny_mce/classes/util/Cookie.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
*/
115115
set : function(n, v, e, p, d, s) {
116116
document.cookie = n + "=" + escape(v) +
117-
((e) ? "; expires=" + e.toGMTString() : "") +
117+
((e) ? "; expires=" + e.toUTCString() : "") +
118118
((p) ? "; path=" + escape(p) : "") +
119119
((d) ? "; domain=" + d : "") +
120120
((s) ? "; secure" : "");

lib/web/tiny_mce/tiny_mce.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/web/tiny_mce/tiny_mce_jquery.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/web/tiny_mce/tiny_mce_jquery_src.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1120,7 +1120,7 @@ tinymce.create('tinymce.util.Dispatcher', {
11201120

11211121
set : function(n, v, e, p, d, s) {
11221122
document.cookie = n + "=" + escape(v) +
1123-
((e) ? "; expires=" + e.toGMTString() : "") +
1123+
((e) ? "; expires=" + e.toUTCString() : "") +
11241124
((p) ? "; path=" + escape(p) : "") +
11251125
((d) ? "; domain=" + d : "") +
11261126
((s) ? "; secure" : "");

lib/web/tiny_mce/tiny_mce_prototype.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)