Merge branch 'v0.30.x'

diff --cc tests/Entity/ExportTest.php
index e022f92f5d66bf8f067faa8c6c838ff8331a135c,b1e6eb5fb712f673ab29d362218d64c4ce2d9ba0..7c56a7268aead1f91817b3d17274cd456e73d255
--- 1/tests/Entity/ExportTest.php
--- 2/tests/Entity/ExportTest.php
+++ b/tests/Entity/ExportTest.php
@@@ -1,9 -1,8 +1,9 @@@
  <?php namespace Tests\Entity;
  
 -use BookStack\Entities\Chapter;
 -use BookStack\Entities\Page;
 +
 +use BookStack\Entities\Models\Chapter;
 +use BookStack\Entities\Models\Page;
- use BookStack\Uploads\HttpFetcher;
+ use Illuminate\Support\Facades\Storage;
  use Illuminate\Support\Str;
  use Tests\TestCase;
  
@@@ -164,4 -166,26 +167,26 @@@ class ExportTest extends TestCas
          $resp->assertSee('<img src="data:image/svg+xml;base64');
      }
  
- }
+     public function test_page_export_contained_html_image_fetches_only_run_when_url_points_to_image_upload_folder()
+     {
+         $page = Page::first();
+         $page->html = '<img src="http://localhost/uploads/images/gallery/svg_test.svg"/>'
+             ."\n".'<img src="http://localhost/uploads/svg_test.svg"/>'
+             ."\n".'<img src="/uploads/svg_test.svg"/>';
+         $storageDisk = Storage::disk('local');
+         $storageDisk->makeDirectory('uploads/images/gallery');
+         $storageDisk->put('uploads/images/gallery/svg_test.svg', '<svg>good</svg>');
+         $storageDisk->put('uploads/svg_test.svg', '<svg>bad</svg>');
+         $page->save();
+ 
+         $resp = $this->asEditor()->get($page->getUrl('/export/html'));
+ 
+         $storageDisk->delete('uploads/images/gallery/svg_test.svg');
+         $storageDisk->delete('uploads/svg_test.svg');
+ 
+         $resp->assertDontSee('http://localhost/uploads/images/gallery/svg_test.svg');
+         $resp->assertSee('http://localhost/uploads/svg_test.svg');
+         $resp->assertSee('src="/uploads/svg_test.svg"');
+     }
+ 
 -}
++}