diff core/modules/rest/src/EventSubscriber/ResourceResponseSubscriber.php @ 5:12f9dff5fda9 tip

Update to Drupal core 8.7.1
author Chris Cannam
date Thu, 09 May 2019 15:34:47 +0100
parents c75dbcec494b
children
line wrap: on
line diff
--- a/core/modules/rest/src/EventSubscriber/ResourceResponseSubscriber.php	Thu Feb 28 13:11:55 2019 +0000
+++ b/core/modules/rest/src/EventSubscriber/ResourceResponseSubscriber.php	Thu May 09 15:34:47 2019 +0100
@@ -207,7 +207,9 @@
     $final_response->setContent($response->getContent());
     $final_response->setStatusCode($response->getStatusCode());
     $final_response->setProtocolVersion($response->getProtocolVersion());
-    $final_response->setCharset($response->getCharset());
+    if ($response->getCharset()) {
+      $final_response->setCharset($response->getCharset());
+    }
     $final_response->headers = clone $response->headers;
     if ($final_response instanceof CacheableResponseInterface) {
       $final_response->addCacheableDependency($response->getCacheableMetadata());