|
@@ -153,7 +153,7 @@ discard block |
|
|
block discarded – undo |
|
153
|
153
|
$data_filesystem = $request->getAttribute('filesystem.data'); |
|
154
|
154
|
assert($data_filesystem instanceof FilesystemInterface); |
|
155
|
155
|
|
|
156
|
|
- $files = $request->getQueryParams()['files']; // local|external|unused |
|
|
156
|
+ $files = $request->getQueryParams()['files']; // local|external|unused |
|
157
|
157
|
|
|
158
|
158
|
// Files within this folder |
|
159
|
159
|
$media_folder = $request->getQueryParams()['media_folder']; |
|
@@ -267,7 +267,7 @@ discard block |
|
|
block discarded – undo |
|
267
|
267
|
$create_form = ''; |
|
268
|
268
|
foreach ($media_trees as $media_tree => $media_directory) { |
|
269
|
269
|
if (str_starts_with($row[0], $media_directory)) { |
|
270
|
|
- $tmp = substr($row[0], strlen($media_directory)); |
|
|
270
|
+ $tmp = substr($row[0], strlen($media_directory)); |
|
271
|
271
|
$create_form .= |
|
272
|
272
|
'<p><a href="#" data-toggle="modal" data-backdrop="static" data-target="#modal-create-media-from-file" data-file="' . e($tmp) . '" data-url="' . e(route('create-media-from-file', ['tree' => $media_tree])) . '" onclick="document.getElementById(\'modal-create-media-from-file-form\').action=this.dataset.url; document.getElementById(\'file\').value=this.dataset.file;">' . I18N::translate('Create') . '</a> — ' . e($media_tree) . '<p>'; |
|
273
|
273
|
} |
|
@@ -361,8 +361,8 @@ discard block |
|
|
block discarded – undo |
|
361
|
361
|
try { |
|
362
|
362
|
// This will work for local filesystems. For remote filesystems, we will |
|
363
|
363
|
// need to copy the file locally to work out the image size. |
|
364
|
|
- $imgsize = getimagesize(Webtrees::DATA_DIR . $file); |
|
365
|
|
- $html .= '<dt>' . I18N::translate('Image dimensions') . '</dt>'; |
|
|
364
|
+ $imgsize = getimagesize(Webtrees::DATA_DIR . $file); |
|
|
365
|
+ $html .= '<dt>' . I18N::translate('Image dimensions') . '</dt>'; |
|
366
|
366
|
/* I18N: image dimensions, width × height */ |
|
367
|
367
|
$html .= '<dd>' . I18N::translate('%1$s × %2$s pixels', I18N::number($imgsize['0']), I18N::number($imgsize['1'])) . '</dd>'; |
|
368
|
368
|
} catch (Throwable $ex) { |