Skip to content

Commit 9e1aa09

Browse files
committed
Mark attachment_basedirectories as optional
Introduce the concept of optional settings, and hide them if the don't exist. Add attachment_basedirectories as an optional setting. Signed-off-by: Oscar Rydhé <[email protected]>
1 parent c72d3a7 commit 9e1aa09

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

repair_settings.php

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -551,6 +551,13 @@ function show_settings()
551551
'theme_path_url_settings' => array(),
552552
);
553553

554+
// These settings are optional and won't be shown if the don't exist
555+
$optional_settings = array(
556+
'path_url_settings' => array(
557+
'attachment_basedirectories'
558+
)
559+
);
560+
554561
// 1.x didn't have ssi_x, nor cachedir
555562
if ($context['is_legacy'])
556563
unset($known_settings['database_settings']['ssi_db_user'], $known_settings['database_settings']['ssi_db_passwd'], $known_settings['cache_settings']['cachedir'], $known_settings['path_url_settings']['custom_avatar_url'], $known_settings['path_url_settings']['custom_avatar_dir']);
@@ -731,7 +738,7 @@ function restoreAll()
731738

732739
foreach ($section as $setting => $info)
733740
{
734-
if (!array_key_exists($setting, $settings))
741+
if (!array_key_exists($setting, $settings) && isset($optional_settings[$settings_section]) && in_array($setting, $optional_settings[$settings_section]))
735742
continue;
736743

737744
if ($info[0] == 'hidden')

0 commit comments

Comments
 (0)