Merge branch 'v23-10' into development

diff --cc app/Entities/Tools/PageContent.php
index 99070ae8935eaf033496fcd54bc40c533012bedb,1bde7b6ce16c4485d2d37028b1726690ad5584c8..552427f4626d474557d3f45fb24d1fa2d5fe01a4
--- 1/app/Entities/Tools/PageContent.php
--- 2/app/Entities/Tools/PageContent.php
+++ b/app/Entities/Tools/PageContent.php
@@@ -9,9 -9,10 +9,11 @@@ use BookStack\Facades\Theme
  use BookStack\Theming\ThemeEvents;
  use BookStack\Uploads\ImageRepo;
  use BookStack\Uploads\ImageService;
+ use BookStack\Users\Models\User;
  use BookStack\Util\HtmlContentFilter;
 -use DOMDocument;
 +use BookStack\Util\HtmlDocument;
+ use BookStack\Util\WebSafeMimeSniffer;
 +use Closure;
  use DOMElement;
  use DOMNode;
  use DOMNodeList;
@@@ -56,13 -58,17 +58,13 @@@ class PageConten
              return $htmlText;
          }
  
 -        $doc = $this->loadDocumentFromHtml($htmlText);
 -        $container = $doc->documentElement;
 -        $body = $container->childNodes->item(0);
 -        $childNodes = $body->childNodes;
 -        $xPath = new DOMXPath($doc);
 +        $doc = new HtmlDocument($htmlText);
  
          // Get all img elements with image data blobs
 -        $imageNodes = $xPath->query('//img[contains(@src, \'data:image\')]');
 +        $imageNodes = $doc->queryXPath('//img[contains(@src, \'data:image\')]');
          foreach ($imageNodes as $imageNode) {
              $imageSrc = $imageNode->getAttribute('src');
-             $newUrl = $this->base64ImageUriToUploadedImageUrl($imageSrc);
+             $newUrl = $this->base64ImageUriToUploadedImageUrl($imageSrc, $updater);
              $imageNode->setAttribute('src', $newUrl);
          }
  

diff --cc tests/Entity/PageContentTest.php
Simple merge

diff --cc tests/ThemeTest.php
Simple merge