diff options
| author | Appleman1234 <applemansigloo@gmail.com> | 2023-04-19 22:16:46 +1000 |
|---|---|---|
| committer | Appleman1234 <applemansigloo@gmail.com> | 2023-04-19 22:16:46 +1000 |
| commit | 3b1f5f7c5eda8bf882c4140200c73b8d78d4983f (patch) | |
| tree | 84db769c82a1c2a271476e2be242392f17985825 | |
| parent | a01eec0b8e263943dc9bd681bf0cb4c05b0c0931 (diff) | |
Backport isset board check in functions.php in loadConfig from main to php7.4 branch for #207php7.4
| -rwxr-xr-x | inc/functions.php | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/inc/functions.php b/inc/functions.php index 23b61404..c342bdd2 100755 --- a/inc/functions.php +++ b/inc/functions.php @@ -228,15 +228,18 @@ function loadConfig() { if (!isset($config['image_deleted'])) $config['image_deleted'] = $config['dir']['static'] . 'deleted.png'; - if (!isset($config['uri_thumb'])) - $config['uri_thumb'] = $config['root'] . $board['dir'] . $config['dir']['thumb']; - elseif (isset($board['dir'])) - $config['uri_thumb'] = sprintf($config['uri_thumb'], $board['dir']); + if (isset($board)) { - if (!isset($config['uri_img'])) - $config['uri_img'] = $config['root'] . $board['dir'] . $config['dir']['img']; - elseif (isset($board['dir'])) - $config['uri_img'] = sprintf($config['uri_img'], $board['dir']); + if (!isset($config['uri_thumb'])) + $config['uri_thumb'] = $config['root'] . $board['dir'] . $config['dir']['thumb']; + elseif (isset($board['dir'])) + $config['uri_thumb'] = sprintf($config['uri_thumb'], $board['dir']); + + if (!isset($config['uri_img'])) + $config['uri_img'] = $config['root'] . $board['dir'] . $config['dir']['img']; + elseif (isset($board['dir'])) + $config['uri_img'] = sprintf($config['uri_img'], $board['dir']); + } if (!isset($config['uri_stylesheets'])) $config['uri_stylesheets'] = $config['root'] . 'stylesheets/'; |
