diff options
| -rw-r--r-- | apps/files_external/lib/config.php | 4 | ||||
| -rw-r--r-- | apps/files_external/tests/Config/PlaceholderSubstituteTest.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php index 2f0cbaca790..5935d117e91 100644 --- a/apps/files_external/lib/config.php +++ b/apps/files_external/lib/config.php @@ -287,9 +287,7 @@ class OC_Mount_Config { $result = true; if(is_array($option)) { foreach ($option as $optionItem) { - if(is_array($optionItem)) { - $result = $result && self::arePlaceholdersSubstituted($option); - } + $result = $result && self::arePlaceholdersSubstituted($optionItem); } } else if (is_string($option)) { if (strpos(rtrim($option, '$'), '$') !== false) { diff --git a/apps/files_external/tests/Config/PlaceholderSubstituteTest.php b/apps/files_external/tests/Config/PlaceholderSubstituteTest.php index 95ef8abda9b..c143d969121 100644 --- a/apps/files_external/tests/Config/PlaceholderSubstituteTest.php +++ b/apps/files_external/tests/Config/PlaceholderSubstituteTest.php @@ -32,6 +32,8 @@ class PlaceholderSubstituteTest extends TestCase { return [ ['smb_$user', false], ['hidden_share$', true], + [['smb_$user', 'hidden_share$'], false], + [['smb_hello', 'hidden_share$'], true] ]; } |