Merge remote-tracking branch 'origin/MAGETWO-59135' into BUGS

sevos1984 · sevos1984 · commit 424d42427923 · 2017-06-21T13:17:29.000+03:00
diff --git a/app/code/Magento/Customer/view/frontend/web/js/invalidation-rules/website-rule.js b/app/code/Magento/Customer/view/frontend/web/js/invalidation-rules/website-rule.js
@@ -23,7 +23,7 @@ define([
             var customer = customerData.get('customer');
 
             if (this.scopeConfig && customer() &&
-                (~~customer().websiteId !== ~~this.scopeConfig.websiteId) && ~~customer().websiteId !== 0) {
+                ~~customer().websiteId !== ~~this.scopeConfig.websiteId && ~~customer().websiteId !== 0) {
                 customerData.reload(['customer']);
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ define([`
`23`	`23`	`var customer = customerData.get('customer');`
`24`	`24`
`25`	`25`	`if (this.scopeConfig && customer() &&`
`26`		`- (~~customer().websiteId !== ~~this.scopeConfig.websiteId) && ~~customer().websiteId !== 0) {`
	`26`	`+ ~~customer().websiteId !== ~~this.scopeConfig.websiteId && ~~customer().websiteId !== 0) {`
`27`	`27`	`customerData.reload(['customer']);`
`28`	`28`	`}`
`29`	`29`	`}`