webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-07-31 15:24:31 +03:00
Code Activity

Merge branch 'v0.11'

Browse Source
This commit is contained in:
Dan Brown
2016-08-14 13:09:44 +01:00
parent 42976ca48c 43d9d2eba7
commit 92d393537c
90 changed files with 563 additions and 462 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Services/ImageService.php
View File

@ -273,7 +273,7 @@ class ImageService
$this->storageUrl = $storageUrl;
}
return ($this->storageUrl == false ? '' : rtrim($this->storageUrl, '/')) . $filePath;
return ($this->storageUrl == false ? rtrim(baseUrl(''), '/') : rtrim($this->storageUrl, '/')) . $filePath;
}