1 files changed, 7 insertions, 4 deletions
diff --git a/js/piwik.js b/js/piwik.js
index e9b8c1ffda..2815bf0eee 100644
--- a/js/piwik.js
+++ b/js/piwik.js
@@ -4023,9 +4023,13 @@ if (typeof window.Piwik !== 'object') {
                     if (isFunction(windowAlias.GearsFactory)) {
                         browserFeatures.gears = '1';
                     }
-
-                    // other browser features
-                    browserFeatures.cookie = hasCookies();
+                    
+                    if (!isDefined(windowAlias.showModalDialog) && isDefined(navigatorAlias.cookieEnabled)) {
+                        browserFeatures.cookie = navigatorAlias.cookieEnabled ? '1' : '0';
+                    } else {
+                        // Eg IE11 ... prevent error when cookieEnabled is requested within modal dialog. see #11507
+                        browserFeatures.cookie = hasCookies();
+                    }
                 }
 
                 var width = parseInt(screenAlias.width, 10);
@@ -6785,7 +6789,6 @@ if (typeof window.Piwik !== 'object') {
              */
             this.disableCookies = function () {
                 configCookiesDisabled = true;
-                browserFeatures.cookie = '0';
 
                 if (configTrackerSiteId) {
                     deleteCookies();