mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #24001 from nextcloud/backport/23889/stable20 

[stable20] Shortcut to avoid file system setup when generating the logo URL
This commit is contained in:
Roeland Jago Douma 2020-11-09 19:55:38 +01:00 committed by GitHub
parent 0d52ba6239 cc777911c2
commit c1e43efa35
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
apps/theming/lib/ThemingDefaults.php
View File

@ -225,11 +225,20 @@ class ThemingDefaults extends \OC_Defaults {
public function getLogo($useSvg = true): string { public function getLogo($useSvg = true): string {
$logo = $this->config->getAppValue('theming', 'logoMime', false); $logo = $this->config->getAppValue('theming', 'logoMime', false);
$logoExists = true; // short cut to avoid setting up the filesystem just to check if the logo is there
try { //
$this->imageManager->getImage('logo', $useSvg); // explanation: if an SVG is requested and the app config value for logoMime is set then the logo is there.
} catch (\Exception $e) { // otherwise we need to check it and maybe also generate a PNG from the SVG (that's done in getImage() which
$logoExists = false; // needs to be called then)
if ($useSvg === true && $logo !== false) {
$logoExists = true;
} else {
try {
$this->imageManager->getImage('logo', $useSvg);
$logoExists = true;
} catch (\Exception $e) {
$logoExists = false;
}
} }
$cacheBusterCounter = $this->config->getAppValue('theming', 'cachebuster', '0'); $cacheBusterCounter = $this->config->getAppValue('theming', 'cachebuster', '0');

6
apps/theming/tests/ThemingDefaultsTest.php
View File

@ -40,7 +40,6 @@ use OCA\Theming\Util;
use OCP\App\IAppManager; use OCP\App\IAppManager;
use OCP\Files\IAppData; use OCP\Files\IAppData;
use OCP\Files\NotFoundException; use OCP\Files\NotFoundException;
use OCP\Files\SimpleFS\ISimpleFile;
use OCP\ICache; use OCP\ICache;
use OCP\ICacheFactory; use OCP\ICacheFactory;
use OCP\IConfig; use OCP\IConfig;
@ -617,11 +616,6 @@ class ThemingDefaultsTest extends TestCase {
} }
public function testGetLogoCustom() { public function testGetLogoCustom() {
$file = $this->createMock(ISimpleFile::class);
$this->imageManager->expects($this->once())
->method('getImage')
->with('logo')
->willReturn($file);
$this->config $this->config
->expects($this->at(0)) ->expects($this->at(0))
->method('getAppValue') ->method('getAppValue')