Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-06-25 15:29:47 +02:00
Code Issues Packages Projects Releases Activity

Media: Prevent fatal error if object doesn't exist (pt 2)

Browse Source
This commit is contained in:
Matias Griese
2022-04-20 21:44:12 +03:00
parent 34c9888ba9
commit 85aa55fabf
1 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
system/src/Grav/Common/Media/Traits/MediaTrait.php
View File

@@ -225,34 +225,37 @@ trait MediaTrait
$var = 'folder';
}
// Set media folder for media fields.
if (isset($var) && $this->exists()) {
$settings['type'] = 'local';
$token = $settings[$var] ?? '';
if (in_array(rtrim($token, '/'), ['', '@self', 'self@', '@self@'], true)) {
$settings += $this->getMediaSettings();
$settings['self'] = true;
} else {
/** @var string|null $uri */
$uri = null;
$event = new Event([
'token' => $token,
'object' => $this,
'field' => $field,
'type' => $type,
'settings' => &$settings, // Value can be changed.
'uri' => &$uri // Value will be set to here.
]);
$this->_mediaSettings[$field] = null;
Grav::instance()->fireEvent('onGetMediaFieldSettings', $event);
try {
// Set media folder for media fields.
if (isset($var)) {
$settings['type'] = 'local';
$token = $settings[$var] ?? '';
if (in_array(rtrim($token, '/'), ['', '@self', 'self@', '@self@'], true)) {
$settings += $this->getMediaSettings();
$settings['self'] = true;
} else {
/** @var string|null $uri */
$uri = null;
$event = new Event([
'token' => $token,
'object' => $this,
'field' => $field,
'type' => $type,
'settings' => &$settings, // Value can be changed.
'uri' => &$uri // Value will be set to here.
]);
$settings[$var] = $uri ?? Utils::getPathFromToken($token, $this);
$settings['self'] = false;
Grav::instance()->fireEvent('onGetMediaFieldSettings', $event);
$settings[$var] = $uri ?? Utils::getPathFromToken($token, $this);
$settings['self'] = false;
}
$this->_mediaSettings[$field] = $settings + ['accept' => '*', 'limit' => 1000, 'self' => true];
}
$this->_mediaSettings[$field] = $settings + ['accept' => '*', 'limit' => 1000, 'self' => true];
} else {
$this->_mediaSettings[$field] = null;
} catch (\Exception $e) {
}
}