averello/nextcloud-server-mirror
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-03-04 18:28:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(theming): Make getImage() call save against missing non-SVG version

Browse Source 
Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling
2024-08-21 10:30:25 +02:00
parent cf56874cb1
commit dbbe2bbcb7
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/private/Repair/RepairLogoDimension.php
View File

@@ -9,6 +9,8 @@ declare(strict_types=1);
namespace OC\Repair;
use OCA\Theming\ImageManager;
use OCP\Files\NotFoundException;
use OCP\Files\NotPermittedException;
use OCP\IConfig;
use OCP\Migration\IOutput;
use OCP\Migration\IRepairStep;
@@ -44,9 +46,18 @@ class RepairLogoDimension implements IRepairStep {
return;
}
$simpleFile = $imageManager->getImage('logo', false);
$image = @imagecreatefromstring($simpleFile->getContent());
try {
try {
$simpleFile = $imageManager->getImage('logo', false);
$image = @imagecreatefromstring($simpleFile->getContent());
} catch (NotFoundException|NotPermittedException) {
$simpleFile = $imageManager->getImage('logo');
$image = false;
}
} catch (NotFoundException|NotPermittedException) {
$output->info('Theming is not used to provide a logo');
return;
}
$dimensions = '';
if ($image !== false) {