Merge pull request #38291 from nextcloud/fix-loading-themed-logo

fix loading custom logo image

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) {
 			}

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);

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);