mirror of
https://github.com/typecho/typecho.git
synced 2025-01-16 20:18:19 +01:00
Fix installation failure (#1664)
* Fix installation failure * fix missing secret * Apply suggestions from code review
This commit is contained in:
parent
3caebb3b20
commit
e306960db4
@ -169,6 +169,13 @@ class Options extends Base
|
||||
$themeOptions = $this->tryDeserialize($options[$themeOptionsKey]);
|
||||
$options = array_merge($options, $themeOptions);
|
||||
}
|
||||
} elseif (function_exists('install_get_default_options')) {
|
||||
$defaultOptions = install_get_default_options();
|
||||
$initOptionKeys = ['routingTable', 'plugins', 'charset', 'contentType', 'timezone', 'installed', 'generator', 'siteUrl', 'lang', 'secret'];
|
||||
|
||||
foreach ($initOptionKeys as $option) {
|
||||
$options[$option] = $defaultOptions[$option];
|
||||
}
|
||||
}
|
||||
|
||||
$this->push($options);
|
||||
|
Loading…
x
Reference in New Issue
Block a user