Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulius Härtl <jus@bitgrid.net>2018-03-28 15:56:31 +0300
committerJulius Härtl <jus@bitgrid.net>2018-04-19 21:14:40 +0300
commitb385f1c7d58561d41c952748e85e77806dc9de06 (patch)
treed433213d2ce6e8ff7bf3554845586391cf50c517 /apps/theming/lib/Controller
parent7f9dabd984282c1ed5d62132c6137a8e88dea925 (diff)
Fix theming tests
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'apps/theming/lib/Controller')
-rw-r--r--apps/theming/lib/Controller/ThemingController.php11
1 files changed, 3 insertions, 8 deletions
diff --git a/apps/theming/lib/Controller/ThemingController.php b/apps/theming/lib/Controller/ThemingController.php
index 2f0bfdd05ca..421af051998 100644
--- a/apps/theming/lib/Controller/ThemingController.php
+++ b/apps/theming/lib/Controller/ThemingController.php
@@ -100,6 +100,7 @@ class ThemingController extends Controller {
* @param SCSSCacher $scssCacher
* @param IURLGenerator $urlGenerator
* @param IAppManager $appManager
+ * @param ImageManager $imageManager
*/
public function __construct(
$appName,
@@ -313,12 +314,7 @@ class ThemingController extends Controller {
if (strpos($setting, 'Mime') !== -1) {
$imageKey = str_replace('Mime', '', $setting);
- try {
- $file = $this->appData->getFolder('images')->getFile($imageKey);
- $file->delete();
- } catch (NotFoundException $e) {
- } catch (NotPermittedException $e) {
- }
+ $this->imageManager->delete($imageKey);
}
return new DataResponse(
@@ -344,8 +340,7 @@ class ThemingController extends Controller {
*/
public function getImage(string $key) {
try {
- /** @var File $file */
- $file = $this->appData->getFolder('images')->getFile($key);
+ $file = $this->imageManager->getImage($key);
} catch (NotFoundException $e) {
return new NotFoundResponse();
}