Skip to content

[stable27] fix loading custom logo image #38409

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
skjnldsv merged 1 commit into from
Jun 1, 2023
Merged

[stable27] fix loading custom logo image #38409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/theming/lib/Util.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ public function getAppIcon($app) {
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) {
}
Expand Down
6 changes: 3 additions & 3 deletions apps/theming/tests/IconBuilderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public function testRenderAppIcon($app, $color, $file) {
->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);
Expand Down Expand Up @@ -132,7 +132,7 @@ public function testGetTouchIcon($app, $color, $file) {
->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);
Expand Down Expand Up @@ -165,7 +165,7 @@ public function testGetFavicon($app, $color, $file) {
->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);
Expand Down
4 changes: 2 additions & 2 deletions apps/theming/tests/UtilTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ public function testGenerateRadioButtonBlack() {
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')
Expand All @@ -180,7 +180,7 @@ public function testGetAppIconThemed() {
->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);
Expand Down