averello/nextcloud-server-mirror
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-03-04 18:28:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix invalid recursion

Browse Source 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
This commit is contained in:
Daniel Kesselberg
2019-07-21 22:55:26 +02:00
parent 1ae68047ea
commit 98c269be53
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/files_external/lib/config.php
View File

@@ -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) {

2
apps/files_external/tests/Config/PlaceholderSubstituteTest.php
View File

@@ -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]
];
}