From b346f216c2e8e02bca20bb3965c79109700a609f Mon Sep 17 00:00:00 2001
From: Kailey Truscott <kinerity@yahoo.com>
Date: Fri, 3 Jul 2015 23:44:43 -0400
Subject: [PATCH 1/3] [ticket/13955] Fix WebFontConig to load web fonts
 correctly

Fix overall_header's WebFontConfig section to load fonts correctly
in all browsers.

PHPBB3-13955
---
 phpBB/styles/prosilver/template/overall_header.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 2b2036883b..ebe6470fee 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -31,7 +31,7 @@
 <script>
 	WebFontConfig = {
 		google: {
-			families: ['Open Sans:n6']
+			families: ['Open+Sans:600:cyrillic-ext,latin,greek-ext,greek,vietnamese,latin-ext,cyrillic']
 		}
 	};
 

From 886ca1dbb9610325f082f3b0c93c65c088766429 Mon Sep 17 00:00:00 2001
From: Kailey Truscott <kinerity@yahoo.com>
Date: Mon, 6 Jul 2015 00:43:29 -0400
Subject: [PATCH 2/3] [ticket/13955] Fix javascript to conform to Google and
 add simple_header

Fix the javascript code to conform to Google Fonts standard
Add code to fix simple_header

PHPBB3-13955
---
 .../prosilver/template/overall_header.html    | 20 +++++++++----------
 .../prosilver/template/simple_header.html     | 20 +++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index ebe6470fee..fe0e44f896 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -28,19 +28,19 @@
 -->
 
 <!-- IF S_ALLOW_CDN -->
-<script>
+<script type="text/javascript">
 	WebFontConfig = {
-		google: {
-			families: ['Open+Sans:600:cyrillic-ext,latin,greek-ext,greek,vietnamese,latin-ext,cyrillic']
-		}
+		google: { families: [ 'Open+Sans:600:cyrillic-ext,latin,greek-ext,greek,vietnamese,latin-ext,cyrillic' ] }
 	};
-
-	(function(d) {
-		var wf = d.createElement('script'), s = d.scripts[0];
-		wf.src = 'https://ajax.googleapis.com/ajax/libs/webfont/1.5.18/webfont.js';
-		wf.async = true;
+	(function() {
+		var wf = document.createElement('script');
+		wf.src = ('https:' == document.location.protocol ? 'https' : 'http') +
+			'://ajax.googleapis.com/ajax/libs/webfont/1/webfont.js';
+		wf.type = 'text/javascript';
+		wf.async = 'true';
+		var s = document.getElementsByTagName('script')[0];
 		s.parentNode.insertBefore(wf, s);
-	})(document);
+	})();
 </script>
 <!-- ENDIF -->
 <link href="{T_STYLESHEET_LINK}" rel="stylesheet">
diff --git a/phpBB/styles/prosilver/template/simple_header.html b/phpBB/styles/prosilver/template/simple_header.html
index 637ac59465..e0c346a01c 100644
--- a/phpBB/styles/prosilver/template/simple_header.html
+++ b/phpBB/styles/prosilver/template/simple_header.html
@@ -7,19 +7,19 @@
 <title>{SITENAME} &bull; <!-- IF S_IN_MCP -->{L_MCP} &bull; <!-- ELSEIF S_IN_UCP -->{L_UCP} &bull; <!-- ENDIF -->{PAGE_TITLE}</title>
 
 <!-- IF S_ALLOW_CDN -->
-<script>
+<script type="text/javascript">
 	WebFontConfig = {
-		google: {
-			families: ['Open Sans:n6']
-		}
+		google: { families: [ 'Open+Sans:600:cyrillic-ext,latin,greek-ext,greek,vietnamese,latin-ext,cyrillic' ] }
 	};
-
-	(function(d) {
-		var wf = d.createElement('script'), s = d.scripts[0];
-		wf.src = 'https://ajax.googleapis.com/ajax/libs/webfont/1.5.18/webfont.js';
-		wf.async = true;
+	(function() {
+		var wf = document.createElement('script');
+		wf.src = ('https:' == document.location.protocol ? 'https' : 'http') +
+			'://ajax.googleapis.com/ajax/libs/webfont/1/webfont.js';
+		wf.type = 'text/javascript';
+		wf.async = 'true';
+		var s = document.getElementsByTagName('script')[0];
 		s.parentNode.insertBefore(wf, s);
-	})(document);
+	})();
 </script>
 <!-- ENDIF -->
 <link href="{T_STYLESHEET_LINK}" rel="stylesheet">

From 4ac22566834e349df45a8b8549db684e332d37e1 Mon Sep 17 00:00:00 2001
From: Kailey Truscott <kinerity@yahoo.com>
Date: Mon, 6 Jul 2015 16:43:57 -0400
Subject: [PATCH 3/3] [ticket/13955] Revert changes made in previous commit

Revert the javascript function change
Place the families code on it's own line

PHPBB3-13955
---
 .../prosilver/template/overall_header.html    | 20 +++++++++----------
 .../prosilver/template/simple_header.html     | 20 +++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index fe0e44f896..ebe6470fee 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -28,19 +28,19 @@
 -->
 
 <!-- IF S_ALLOW_CDN -->
-<script type="text/javascript">
+<script>
 	WebFontConfig = {
-		google: { families: [ 'Open+Sans:600:cyrillic-ext,latin,greek-ext,greek,vietnamese,latin-ext,cyrillic' ] }
+		google: {
+			families: ['Open+Sans:600:cyrillic-ext,latin,greek-ext,greek,vietnamese,latin-ext,cyrillic']
+		}
 	};
-	(function() {
-		var wf = document.createElement('script');
-		wf.src = ('https:' == document.location.protocol ? 'https' : 'http') +
-			'://ajax.googleapis.com/ajax/libs/webfont/1/webfont.js';
-		wf.type = 'text/javascript';
-		wf.async = 'true';
-		var s = document.getElementsByTagName('script')[0];
+
+	(function(d) {
+		var wf = d.createElement('script'), s = d.scripts[0];
+		wf.src = 'https://ajax.googleapis.com/ajax/libs/webfont/1.5.18/webfont.js';
+		wf.async = true;
 		s.parentNode.insertBefore(wf, s);
-	})();
+	})(document);
 </script>
 <!-- ENDIF -->
 <link href="{T_STYLESHEET_LINK}" rel="stylesheet">
diff --git a/phpBB/styles/prosilver/template/simple_header.html b/phpBB/styles/prosilver/template/simple_header.html
index e0c346a01c..baa6223754 100644
--- a/phpBB/styles/prosilver/template/simple_header.html
+++ b/phpBB/styles/prosilver/template/simple_header.html
@@ -7,19 +7,19 @@
 <title>{SITENAME} &bull; <!-- IF S_IN_MCP -->{L_MCP} &bull; <!-- ELSEIF S_IN_UCP -->{L_UCP} &bull; <!-- ENDIF -->{PAGE_TITLE}</title>
 
 <!-- IF S_ALLOW_CDN -->
-<script type="text/javascript">
+<script>
 	WebFontConfig = {
-		google: { families: [ 'Open+Sans:600:cyrillic-ext,latin,greek-ext,greek,vietnamese,latin-ext,cyrillic' ] }
+		google: {
+			families: ['Open+Sans:600:cyrillic-ext,latin,greek-ext,greek,vietnamese,latin-ext,cyrillic']
+		}
 	};
-	(function() {
-		var wf = document.createElement('script');
-		wf.src = ('https:' == document.location.protocol ? 'https' : 'http') +
-			'://ajax.googleapis.com/ajax/libs/webfont/1/webfont.js';
-		wf.type = 'text/javascript';
-		wf.async = 'true';
-		var s = document.getElementsByTagName('script')[0];
+
+	(function(d) {
+		var wf = d.createElement('script'), s = d.scripts[0];
+		wf.src = 'https://ajax.googleapis.com/ajax/libs/webfont/1.5.18/webfont.js';
+		wf.async = true;
 		s.parentNode.insertBefore(wf, s);
-	})();
+	})(document);
 </script>
 <!-- ENDIF -->
 <link href="{T_STYLESHEET_LINK}" rel="stylesheet">