mirror of
https://github.com/the-djmaze/snappymail.git
synced 2024-09-20 15:45:55 +08:00
Cleanup yaml parsing
This commit is contained in:
parent
aa805f9ff9
commit
957ccfeb3b
|
@ -41,12 +41,12 @@ if (\class_exists('RainLoop\Api'))
|
||||||
\MailSo\Base\Loader::Init();
|
\MailSo\Base\Loader::Init();
|
||||||
|
|
||||||
if (!\function_exists('yaml_parse')) {
|
if (!\function_exists('yaml_parse')) {
|
||||||
include RAINLOOP_APP_LIBRARIES_PATH.'spyc/Spyc.php';
|
|
||||||
function yaml_parse(string $input) {
|
function yaml_parse(string $input) {
|
||||||
return \Spyc::YAMLLoadString($input);
|
require_once RAINLOOP_APP_LIBRARIES_PATH.'spyc/Spyc.php';
|
||||||
|
return \Spyc::YAMLLoadString(\str_replace(array(': >-', ': |-', ': |+'), array(': >', ': |', ': |'), $input));
|
||||||
}
|
}
|
||||||
function yaml_parse_file(string $filename) {
|
function yaml_parse_file(string $filename) {
|
||||||
return \Spyc::YAMLLoad($filename);
|
return yaml_parse(\file_get_contents($filename));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -253,7 +253,6 @@ class Utils
|
||||||
{
|
{
|
||||||
if ('.yml' === substr($sFileName, -4))
|
if ('.yml' === substr($sFileName, -4))
|
||||||
{
|
{
|
||||||
//- $aLang = \yaml_parse(\str_replace(array(': >-', ': |-', ': |+'), array(': >', ': |', ': |'), \file_get_contents($sFileName)));
|
|
||||||
$aLang = \yaml_parse_file($sFileName);
|
$aLang = \yaml_parse_file($sFileName);
|
||||||
if (\is_array($aLang))
|
if (\is_array($aLang))
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue