|
@@ -272,7 +272,7 @@ discard block |
|
|
block discarded – undo |
|
272
|
272
|
$create_form = ''; |
|
273
|
273
|
foreach ($media_trees as $media_tree => $media_directory) { |
|
274
|
274
|
if (str_starts_with($row[0], $media_directory)) { |
|
275
|
|
- $tmp = substr($row[0], strlen($media_directory)); |
|
|
275
|
+ $tmp = substr($row[0], strlen($media_directory)); |
|
276
|
276
|
$create_form .= |
|
277
|
277
|
'<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>'; |
|
278
|
278
|
} |
|
@@ -366,8 +366,8 @@ discard block |
|
|
block discarded – undo |
|
366
|
366
|
try { |
|
367
|
367
|
// This will work for local filesystems. For remote filesystems, we will |
|
368
|
368
|
// need to copy the file locally to work out the image size. |
|
369
|
|
- $imgsize = getimagesize(Webtrees::DATA_DIR . $file); |
|
370
|
|
- $html .= '<dt>' . I18N::translate('Image dimensions') . '</dt>'; |
|
|
369
|
+ $imgsize = getimagesize(Webtrees::DATA_DIR . $file); |
|
|
370
|
+ $html .= '<dt>' . I18N::translate('Image dimensions') . '</dt>'; |
|
371
|
371
|
/* I18N: image dimensions, width × height */ |
|
372
|
372
|
$html .= '<dd>' . I18N::translate('%1$s × %2$s pixels', I18N::number($imgsize['0']), I18N::number($imgsize['1'])) . '</dd>'; |
|
373
|
373
|
} catch (Throwable $ex) { |
Please login to merge, or discard this patch.