Skip to content

[FIX] StudyProgramme: Make updating custom icon less fragile #11505

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

Open
mjansenDatabay wants to merge 1 commit into
base: release_11
Choose a base branch
from
Open

[FIX] StudyProgramme: Make updating custom icon less fragile #11505

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
15 changes: 11 additions & 4 deletions components/ILIAS/StudyProgramme/classes/class.ilObjStudyProgramme.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1607,10 +1607,17 @@ public function updateCustomIcon(): void

if ($subtype && $subtype->getIconIdentifier()) {
$src = $this->type_repository->getIconPathFS($subtype);
if ($src === null || $src === '') {
// The subtype references an icon id that no longer resolves to a file, so delete it
$customIcon->remove();
return;
}

//This is a horrible hack to allow Flysystem/LocalFilesystem to read the file.
$tmp = 'ico_' . $this->getId();
copy($src, \ilFileUtils::getDataDir() . '/temp/' . $tmp);
if (!copy($src, ilFileUtils::getDataDir() . '/temp/' . $tmp)) {
return;
}

$customIcon->saveFromTempFileName($tmp);
} else {
Expand Down Expand Up @@ -1909,14 +1916,14 @@ public function statusToRepr(int $status): string

public function hasContentPage(): bool
{
return \ilContainerPage::_exists(self::CP_TYPE, $this->getId());
return ilContainerPage::_exists(self::CP_TYPE, $this->getId());
}
public function createContentPage(): void
{
if ($this->hasContentPage()) {
throw new \LogicException('will not create content page - it already exists.');
throw new LogicException('will not create content page - it already exists.');
}
$new_page_object = new \ilContainerPage();
$new_page_object = new ilContainerPage();
$new_page_object->setId($this->getId());
$new_page_object->setParentId($this->getId());
$new_page_object->createFromXML();
Expand Down
Loading