From abfe0f66483c356aaeb61b5a836286b251eb1e53 Mon Sep 17 00:00:00 2001
From: mattab <matthieu.aubry@gmail.com>
Date: Wed, 4 Jun 2014 14:49:01 +1200
Subject: [PATCH] Make the X-UA-Compatible consistent across piwik codebase
Refs https://github.com/piwik/piwik/pull/302 refs #5282
---
plugins/Dashboard/templates/_header.twig | 2 +-
plugins/Login/templates/login.twig | 2 +-
plugins/Morpheus/templates/admin.twig | 2 +-
tests/resources/overlay-test-site/index.html | 2 +-
tests/resources/overlay-test-site/page-1.html | 2 +-
tests/resources/overlay-test-site/page-2.html | 2 +-
tests/resources/overlay-test-site/page-3.html | 2 +-
tests/resources/overlay-test-site/page-4.html | 2 +-
tests/resources/overlay-test-site/page-5.html | 2 +-
tests/resources/overlay-test-site/page-6.html | 2 +-
10 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/plugins/Dashboard/templates/_header.twig b/plugins/Dashboard/templates/_header.twig
index c9ea093708..050564e733 100644
--- a/plugins/Dashboard/templates/_header.twig
+++ b/plugins/Dashboard/templates/_header.twig
@@ -3,7 +3,7 @@
<html>
<head>
<meta charset="utf-8">
- <meta http-equiv="x-ua-compatible" content="IE=edge" >
+ <meta http-equiv="x-ua-compatible" content="IE=EDGE,chrome=1" >
<title>{{ 'Dashboard_Dashboard'|translate }} - {{ 'CoreHome_WebAnalyticsReports'|translate }}</title>
<!--[if lt IE 9]>
diff --git a/plugins/Login/templates/login.twig b/plugins/Login/templates/login.twig
index fa4351eec8..166035d7cf 100644
--- a/plugins/Login/templates/login.twig
+++ b/plugins/Login/templates/login.twig
@@ -5,7 +5,7 @@
<html><!--<![endif]-->
<head>
<meta charset="utf-8">
- <meta http-equiv="x-ua-compatible" content="IE=edge" >
+ <meta http-equiv="x-ua-compatible" content="IE=EDGE,chrome=1" >
<title>{% if isCustomLogo == false %}Piwik › {% endif %}{{ 'Login_LogIn'|translate }}</title>
{% include "@CoreHome/_favicon.twig" %}
diff --git a/plugins/Morpheus/templates/admin.twig b/plugins/Morpheus/templates/admin.twig
index 6431f970d2..2a8ed8370e 100644
--- a/plugins/Morpheus/templates/admin.twig
+++ b/plugins/Morpheus/templates/admin.twig
@@ -6,7 +6,7 @@
<head>
{% block head %}
<meta charset="utf-8">
- <meta http-equiv="x-ua-compatible" content="IE=edge" >
+ <meta http-equiv="x-ua-compatible" content="IE=EDGE,chrome=1" >
<title>{% if not isCustomLogo %}Piwik › {% endif %}{{ 'CoreAdminHome_Administration'|translate }}</title>
<meta name="generator" content="Piwik - Open Source Web Analytics"/>
<link rel="shortcut icon" href="{{ customFavicon|default('plugins/CoreHome/images/favicon.ico') }}"/>
diff --git a/tests/resources/overlay-test-site/index.html b/tests/resources/overlay-test-site/index.html
index 5f79bef5c1..6a7ff8e139 100644
--- a/tests/resources/overlay-test-site/index.html
+++ b/tests/resources/overlay-test-site/index.html
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge">
+ <meta http-equiv="X-UA-Compatible" content="IE=EDGE,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Bootstrap 101 Template</title>
diff --git a/tests/resources/overlay-test-site/page-1.html b/tests/resources/overlay-test-site/page-1.html
index 7cb2981670..c5440529e7 100644
--- a/tests/resources/overlay-test-site/page-1.html
+++ b/tests/resources/overlay-test-site/page-1.html
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge">
+ <meta http-equiv="X-UA-Compatible" content="IE=EDGE,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Bootstrap 101 Template</title>
diff --git a/tests/resources/overlay-test-site/page-2.html b/tests/resources/overlay-test-site/page-2.html
index 321f0ebbcc..003a16f12d 100644
--- a/tests/resources/overlay-test-site/page-2.html
+++ b/tests/resources/overlay-test-site/page-2.html
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge">
+ <meta http-equiv="X-UA-Compatible" content="IE=EDGE,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Bootstrap 101 Template</title>
diff --git a/tests/resources/overlay-test-site/page-3.html b/tests/resources/overlay-test-site/page-3.html
index 615f733d41..a93c54c80b 100644
--- a/tests/resources/overlay-test-site/page-3.html
+++ b/tests/resources/overlay-test-site/page-3.html
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge">
+ <meta http-equiv="X-UA-Compatible" content="IE=EDGE,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Bootstrap 101 Template</title>
diff --git a/tests/resources/overlay-test-site/page-4.html b/tests/resources/overlay-test-site/page-4.html
index 24a593926e..ec4ad8b67b 100644
--- a/tests/resources/overlay-test-site/page-4.html
+++ b/tests/resources/overlay-test-site/page-4.html
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge">
+ <meta http-equiv="X-UA-Compatible" content="IE=EDGE,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Bootstrap 101 Template</title>
diff --git a/tests/resources/overlay-test-site/page-5.html b/tests/resources/overlay-test-site/page-5.html
index ab2c6c23de..35b8414657 100644
--- a/tests/resources/overlay-test-site/page-5.html
+++ b/tests/resources/overlay-test-site/page-5.html
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge">
+ <meta http-equiv="X-UA-Compatible" content="IE=EDGE,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Bootstrap 101 Template</title>
diff --git a/tests/resources/overlay-test-site/page-6.html b/tests/resources/overlay-test-site/page-6.html
index 4db64e8081..be42f72e3c 100644
--- a/tests/resources/overlay-test-site/page-6.html
+++ b/tests/resources/overlay-test-site/page-6.html
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge">
+ <meta http-equiv="X-UA-Compatible" content="IE=EDGE,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Bootstrap 101 Template</title>
--
GitLab