Skip to content

Commit 8332ac8

Browse files
committed
fix loading custom logo image
Signed-off-by: Robin Appelman <robin@icewind.nl>
1 parent 8362eea commit 8332ac8

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

apps/theming/lib/Util.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ public function getAppIcon($app) {
190190
if ($this->config->getAppValue('theming', 'logoMime', '') !== '') {
191191
$logoFile = null;
192192
try {
193-
$folder = $this->appData->getFolder('images');
193+
$folder = $this->appData->getFolder('global/images');
194194
return $folder->getFile('logo');
195195
} catch (NotFoundException $e) {
196196
}

apps/theming/tests/UtilTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ public function testGenerateRadioButtonBlack() {
153153
public function testGetAppIcon($app, $expected) {
154154
$this->appData->expects($this->any())
155155
->method('getFolder')
156-
->with('images')
156+
->with('global/images')
157157
->willThrowException(new NotFoundException());
158158
$this->appManager->expects($this->once())
159159
->method('getAppPath')
@@ -180,7 +180,7 @@ public function testGetAppIconThemed() {
180180
->willReturn($file);
181181
$this->appData->expects($this->once())
182182
->method('getFolder')
183-
->with('images')
183+
->with('global/images')
184184
->willReturn($folder);
185185
$icon = $this->util->getAppIcon('noapplikethis');
186186
$this->assertEquals($file, $icon);

0 commit comments

Comments
 (0)