diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2023-06-01 10:05:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-01 10:05:11 +0200 |
| commit | 1a76ea188da39bc2fac3ef0e0f2df11047e04a80 (patch) | |
| tree | 7bbe20f01935b4573091c0859b1c77bf9bba560c | |
| parent | a379bba6b87372a99131438ea2e18d98b8dee17f (diff) | |
| parent | 21d50794f03fe777692a18533764979d18caf43e (diff) | |
| download | nextcloud-server-1a76ea188da39bc2fac3ef0e0f2df11047e04a80.tar.gz nextcloud-server-1a76ea188da39bc2fac3ef0e0f2df11047e04a80.zip | |
Merge pull request #38409 from nextcloud/backport/38291/stable27
| -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); |