Compare commits
1 Commits
da2801560d
...
15f7b1e9a2
Author | SHA1 | Date | |
---|---|---|---|
15f7b1e9a2 |
@ -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);
|
||||||
@ -305,8 +305,6 @@ class PersistentDataManager implements IPersistentDataManager
|
|||||||
|
|
||||||
if ($relationModel !== null) {
|
if ($relationModel !== null) {
|
||||||
$model->$methodSet($relationModel->getId());
|
$model->$methodSet($relationModel->getId());
|
||||||
} else {
|
|
||||||
$model->$methodSet(null);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -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);
|
||||||
|
Loading…
Reference in New Issue
Block a user