diff options
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files/lib/Controller/ViewController.php | 6 | ||||
| -rw-r--r-- | apps/files/tests/Controller/ViewControllerTest.php | 5 |
2 files changed, 2 insertions, 9 deletions
diff --git a/apps/files/lib/Controller/ViewController.php b/apps/files/lib/Controller/ViewController.php index 67cd0bf2aef..2e6ffa6a749 100644 --- a/apps/files/lib/Controller/ViewController.php +++ b/apps/files/lib/Controller/ViewController.php @@ -52,7 +52,6 @@ use OCP\AppFramework\Http\Response; use OCP\AppFramework\Http\TemplateResponse; use OCP\AppFramework\Services\IInitialState; use OCP\Collaboration\Resources\LoadAdditionalScriptsEvent as ResourcesLoadAdditionalScriptsEvent; -use OCP\Constants; use OCP\EventDispatcher\IEventDispatcher; use OCP\Files\Folder; use OCP\Files\IRootFolder; @@ -253,9 +252,8 @@ class ViewController extends Controller { $this->initialState->provideInitialState('filesSortingConfig', $filesSortingConfig); // Forbidden file characters - /** @var string[] */ - $forbiddenCharacters = $this->config->getSystemValue('forbidden_chars', []); - $this->initialState->provideInitialState('forbiddenCharacters', Constants::FILENAME_INVALID_CHARS . implode('', $forbiddenCharacters)); + $forbiddenCharacters = \OCP\Util::getForbiddenFileNameChars(); + $this->initialState->provideInitialState('forbiddenCharacters', implode('', $forbiddenCharacters)); $event = new LoadAdditionalScriptsEvent(); $this->eventDispatcher->dispatchTyped($event); diff --git a/apps/files/tests/Controller/ViewControllerTest.php b/apps/files/tests/Controller/ViewControllerTest.php index 2714a6b25c0..79834539883 100644 --- a/apps/files/tests/Controller/ViewControllerTest.php +++ b/apps/files/tests/Controller/ViewControllerTest.php @@ -153,11 +153,6 @@ class ViewControllerTest extends TestCase { ]); $this->config - ->expects($this->any()) - ->method('getSystemValue') - ->with('forbidden_chars', []) - ->willReturn([]); - $this->config ->method('getUserValue') ->willReturnMap([ [$this->user->getUID(), 'files', 'file_sorting', 'name', 'name'], |