mirror/Part-DB.Part-DB-server
1
0
Fork 1
mirror of https://github.com/Part-DB/Part-DB-server.git synced 2025-07-12 19:34:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed assets path generation on windows (use server path for files where this is possible).

Browse source
This commit is contained in:
Jan Böhmer 2020-06-07 19:25:58 +02:00
parent f089a16d74
commit bebe70d28e
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/Services/Attachments/AttachmentURLGenerator.php
View file

@ -87,12 +87,13 @@ class AttachmentURLGenerator
*/ */
public function absolutePathToAssetPath(string $absolute_path, ?string $public_path = null): ?string public function absolutePathToAssetPath(string $absolute_path, ?string $public_path = null): ?string
{ {
//Normalize file path (public path, use / as file path)
$absolute_path = str_replace('\\', '/', $absolute_path);
if (null === $public_path) { if (null === $public_path) {
$public_path = $this->public_path; $public_path = $this->public_path;
} }
//Our absolute path must begin with public path or we can not use it for asset pathes. //Our absolute path must begin with public path or we can not use it for asset pathes.
if (0 !== strpos($absolute_path, $public_path)) { if (0 !== strpos($absolute_path, $public_path)) {
return null; return null;