Fix invalid recursion

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>

diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index 2f0cbaca790b16da207a5da33195b9c1109577f1..5935d117e91a9c6cffa33a4506f7a6d23b791377 100644 (file)
--- 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 95ef8abda9b1bc512f675d91f0ab28c45d7f8700..c143d96912103ba8caa5d35fd724fffc551c81c8 100644 (file)
--- 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]
                ];
        }