Merge branch '5.3' into 5.4
authorTim Düsterhus <duesterhus@woltlab.com>
Tue, 6 Jul 2021 10:47:52 +0000 (12:47 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Tue, 6 Jul 2021 10:47:52 +0000 (12:47 +0200)
wcfsetup/install/files/lib/system/style/FontManager.class.php

index 0799dcc33c81bbf0e61fb1a3ff21cfbb1cdbd26d..58466c4c874ce254d96b2e7cf6b71c0aae6268e4 100644 (file)
@@ -84,7 +84,7 @@ class FontManager extends SingletonFactory
     public function downloadFamily($family)
     {
         try {
-            $response = $this->http->send(new Request('GET', $family . '/manifest.json'));
+            $response = $this->http->send(new Request('GET', \rawurlencode($family) . '/manifest.json'));
             $manifest = JSON::decode($response->getBody());
 
             $familyDirectory = \dirname($this->getCssFilename($family));
@@ -103,7 +103,7 @@ class FontManager extends SingletonFactory
                     throw new \InvalidArgumentException("Invalid filename '" . $filename . "' given.");
                 }
 
-                $response = $this->http->send(new Request('GET', $family . '/' . $filename));
+                $response = $this->http->send(new Request('GET', \rawurlencode($family) . '/' . \rawurlencode($filename)));
 
                 $file = new AtomicWriter($familyDirectory . '/' . $filename);
                 while (!$response->getBody()->eof()) {