From: Alexander Ebert <ebert@woltlab.com>
Date: Mon, 3 Feb 2020 19:01:32 +0000 (+0100)
Subject: Revert "Add &display=swap to Google Font request"
X-Git-Tag: 5.2.2~10
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=faab60913579a4338f6ac6e40bc8a6d3926e0e69;p=GitHub%2FWoltLab%2FWCF.git

Revert "Add &display=swap to Google Font request"

This reverts commit f869569107955803acf4625daab2f4e080f00f80.

The `font-display: swap` behaves quite different from the previous approach and causes a FOUT even on fast connections.
Changing the default behavior in a bugfix release doesn't feel right at this time, we should revisit this with 5.3.
---

diff --git a/com.woltlab.wcf/templates/headInclude.tpl b/com.woltlab.wcf/templates/headInclude.tpl
index aa41a08c0c..f822ef17b8 100644
--- a/com.woltlab.wcf/templates/headInclude.tpl
+++ b/com.woltlab.wcf/templates/headInclude.tpl
@@ -7,7 +7,7 @@
 
 <!-- Stylesheets -->
 {if $__wcf->getStyleHandler()->getStyle()->getVariable('useGoogleFont')}
-	<link href='//fonts.googleapis.com/css?family={$__wcf->getStyleHandler()->getStyle()->getVariable('wcfFontFamilyGoogle')|urlencode}:400,300,600&amp;display=swap' rel='stylesheet' type='text/css'>
+	<link href='//fonts.googleapis.com/css?family={$__wcf->getStyleHandler()->getStyle()->getVariable('wcfFontFamilyGoogle')|urlencode}:400,300,600' rel='stylesheet' type='text/css'>
 {/if}
 {@$__wcf->getStyleHandler()->getStylesheet()}
 {event name='stylesheets'}