Compare commits

..

1 Commits

Author SHA1 Message Date
126720814e
fix the case when relation is set to null
All checks were successful
soko-web/pipeline/pr-master This commit looks good
2023-05-28 12:19:57 +02:00
2 changed files with 2 additions and 7 deletions

View File

@ -115,7 +115,7 @@ class PersistentDataManager implements IPersistentDataManager
if (count($modified) > 0) { if (count($modified) > 0) {
if ($model instanceof ModelWithSlug && isset($modified['slug'])) { if ($model instanceof ModelWithSlug && isset($modified['slug'])) {
$diff['slug']['new'] = $modified['slug'] = $this->generateUniqueSlug($model, $modified['slug']); $modified['slug'] = $this->generateUniqueSlug($model, $modified['slug']);
} }
$modify->setId($id); $modify->setId($id);

View File

@ -97,13 +97,8 @@ class Linker
fwrite($outputFileHandle, $extra[0]); fwrite($outputFileHandle, $extra[0]);
while (($line = fgets($inputFileHandle)) !== false) { while (($line = fgets($inputFileHandle)) !== false) {
if (preg_match('/^\s*@include\((.*)\)\s*$/', $line, $matches) === 1) {
$include = file_get_contents(ROOT . '/views/' . $matches[1] . '.php');
fwrite($outputFileHandle, $include);
} else {
fwrite($outputFileHandle, $line); fwrite($outputFileHandle, $line);
} }
}
fwrite($outputFileHandle, $extra[1]); fwrite($outputFileHandle, $extra[1]);
fclose($inputFileHandle); fclose($inputFileHandle);