diff options
| author | Robin Appelman <robin@icewind.nl> | 2023-05-15 17:38:43 +0200 |
|---|---|---|
| committer | backportbot-nextcloud[bot] <backportbot-nextcloud[bot]@users.noreply.github.com> | 2023-05-23 07:41:40 +0000 |
| commit | 21d50794f03fe777692a18533764979d18caf43e (patch) | |
| tree | 924c026cd508eecf2c0f65511d3934c7362d7357 /apps/theming | |
| parent | 713b9603a4e36a41efa0cd2c0ba88e4fa6ab893f (diff) | |
| download | nextcloud-server-21d50794f03fe777692a18533764979d18caf43e.tar.gz nextcloud-server-21d50794f03fe777692a18533764979d18caf43e.zip | |
fix loading custom logo image
Signed-off-by: Robin Appelman <robin@icewind.nl>
Diffstat (limited to 'apps/theming')
| -rw-r--r-- | apps/theming/lib/Util.php | 2 | ||||
| -rw-r--r-- | apps/theming/tests/IconBuilderTest.php | 6 | ||||
| -rw-r--r-- | apps/theming/tests/UtilTest.php | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/apps/theming/lib/Util.php b/apps/theming/lib/Util.php index 789da394567..635c0026112 100644 --- a/apps/theming/lib/Util.php +++ b/apps/theming/lib/Util.php @@ -190,7 +190,7 @@ class Util { if ($this->config->getAppValue('theming', 'logoMime', '') !== '') { $logoFile = null; try { - $folder = $this->appData->getFolder('images'); + $folder = $this->appData->getFolder('global/images'); return $folder->getFile('logo'); } catch (NotFoundException $e) { } diff --git a/apps/theming/tests/IconBuilderTest.php b/apps/theming/tests/IconBuilderTest.php index 6edd6a05525..5637ce25cb6 100644 --- a/apps/theming/tests/IconBuilderTest.php +++ b/apps/theming/tests/IconBuilderTest.php @@ -103,7 +103,7 @@ class IconBuilderTest extends TestCase { ->willReturn($color); $this->appData->expects($this->once()) ->method('getFolder') - ->with('images') + ->with('global/images') ->willThrowException(new NotFoundException()); $expectedIcon = new \Imagick(realpath(dirname(__FILE__)). "/data/" . $file); @@ -132,7 +132,7 @@ class IconBuilderTest extends TestCase { ->willReturn($color); $this->appData->expects($this->once()) ->method('getFolder') - ->with('images') + ->with('global/images') ->willThrowException(new NotFoundException()); $expectedIcon = new \Imagick(realpath(dirname(__FILE__)). "/data/" . $file); @@ -165,7 +165,7 @@ class IconBuilderTest extends TestCase { ->willReturn($color); $this->appData->expects($this->once()) ->method('getFolder') - ->with('images') + ->with('global/images') ->willThrowException(new NotFoundException()); $expectedIcon = new \Imagick(realpath(dirname(__FILE__)). "/data/" . $file); diff --git a/apps/theming/tests/UtilTest.php b/apps/theming/tests/UtilTest.php index 137038acb98..febf6c0a79e 100644 --- a/apps/theming/tests/UtilTest.php +++ b/apps/theming/tests/UtilTest.php @@ -153,7 +153,7 @@ class UtilTest extends TestCase { public function testGetAppIcon($app, $expected) { $this->appData->expects($this->any()) ->method('getFolder') - ->with('images') + ->with('global/images') ->willThrowException(new NotFoundException()); $this->appManager->expects($this->once()) ->method('getAppPath') @@ -180,7 +180,7 @@ class UtilTest extends TestCase { ->willReturn($file); $this->appData->expects($this->once()) ->method('getFolder') - ->with('images') + ->with('global/images') ->willReturn($folder); $icon = $this->util->getAppIcon('noapplikethis'); $this->assertEquals($file, $icon); |