mirror/php-typemill
1
0
Fork 0
mirror of https://github.com/typemill/typemill.git synced 2025-07-25 00:02:28 +02:00
Code Issues Releases Wiki Activity

Finish 2.18.0

Browse Source
This commit is contained in:
trendschau
2025-07-14 20:16:37 +02:00
parent 9435391c3a
commit 311983997e
3 changed files with 5 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cache/timer.yaml vendored
View File

@@ -1,2 +1,2 @@
licenseupdate: 1751827655
refreshnavi: 1752352809
refreshnavi: 1752466762

27
system/typemill/Models/Settings.php
View File

@@ -189,35 +189,14 @@ class Settings
# remove them from $newSettings to avoid overwriting twice
unset($newSettings['plugins'], $newSettings['themes']);
# add current theme from usersettings
$newSettings['theme'] = $userSettings['theme'];
# final combined settings
$settings = array_merge($newSettings, [
'plugins' => $plugins,
'themes' => $themes,
]);
/*
# merge usersettings with new settings
$settings = array_merge($userSettings, $newSettings);
# make sure that multidimensional arrays are merged correctly
# for example: only one plugin data will be passed with new settings, with array merge all others will be deleted.
foreach($newSettings as $key => $settingsItems)
{
if(is_array($settingsItems) && isset($userSettings[$key]))
{
if($this->array_is_list($settingsItems))
{
# for numeric/list arrays instead of associative arrays we only use new values
$settings[$key] = $newSettings[$key];
}
else
{
# changed from array_merge to array_replace to preserve the index, otherwise numeric values get re-indexed. Alternative is
$settings[$key] = array_replace($userSettings[$key], $newSettings[$key]);
}
}
}
*/
}
if($this->storage->updateYaml('settingsFolder', '', 'settings.yaml', $settings))

2
system/typemill/settings/defaults.yaml
View File

@@ -1,4 +1,4 @@
version: '2.17.4'
version: '2.18.0'
title: 'Typemill'
author: 'Unknown'
copyright: false