Merge 490edc8 into 3c4940a

DorsetDigital · Nov 1, 2023 · 9431565 · 9431565
2 parents 3c4940a + 490edc8
commit 9431565
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/composer.json b/composer.json
@@ -10,10 +10,6 @@
    "email": "tim@dorset-digital.net"
   }
  ], 
- "require": {
-  "silverstripe/vendor-plugin": "^1.0",
-  "silverstripe/cms": "^4.0"
- },
  "license": "BSD-3-Clause",
  "autoload": {
   "psr-4": {

diff --git a/src/CDNMiddleware.php b/src/CDNMiddleware.php
@@ -87,7 +87,7 @@ public function process(HTTPRequest $request, callable $delegate)
 
             if ($this->getIsAdmin($request) === false) {
                 $body = $response->getBody();
-                $this->rewriteTags($body, $response);
+                $this->rewriteTags($body);
                 $this->addPrefetch($body, $response);
                 $response->setBody($body);
             }
@@ -122,8 +122,10 @@ private function canRun()
      * @param $body
      * @param $response
      */
-    private function rewriteTags(&$body, &$response)
+    private function rewriteTags(&$body)
     {
+        $body = ($body ?: '');
+
         $cdn = $this->config()->get('cdn_domain');
         $subDir = $this->getSubdirectory();
         $prefixes = $this->config()->get('rewrites');
@@ -136,6 +138,7 @@ private function rewriteTags(&$body, &$response)
                 'src="/' . $subDir . $cleanPrefix . '/',
                 'src=\"/' . $subDir . $cleanPrefix . '/',
                 'href="/' . $subDir . $cleanPrefix . '/',
+                'background-image: url(/' . $subDir . $cleanPrefix . '/',
                 Director::absoluteBaseURL() . $cleanPrefix . '/'
             ];
 
@@ -144,6 +147,7 @@ private function rewriteTags(&$body, &$response)
                 'src="' . $cdn . '/' . $subDir . $cleanPrefix . '/',
                 'src=\"' . $cdn . '/' . $subDir . $cleanPrefix . '/',
                 'href="' . $cdn . '/' . $subDir . $cleanPrefix . '/',
+                'background-image: url(' . $cdn . '/' . $subDir . $cleanPrefix . '/',
                 $cdn . '/' . $subDir . $cleanPrefix . '/'
             ];
 
@@ -154,6 +158,8 @@ private function rewriteTags(&$body, &$response)
 
     private function addPrefetch(&$body, &$response)
     {
+        $body = ($body ?: '');
+
         if ($this->config()->get('add_prefetch') === true) {
             $prefetchTag = $this->getPrefetchTag();
             $body = str_replace('<head>', "<head>" . $prefetchTag, $body);