the-djmaze/snappymail
1
1
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2024-09-20 07:35:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup yaml parsing

Browse source
This commit is contained in:
djmaze 2020-07-07 13:47:19 +02:00
parent aa805f9ff9
commit 957ccfeb3b
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
rainloop/v/0.0.0/app/handle.php
View file

@ -41,12 +41,12 @@ if (\class_exists('RainLoop\Api'))
\MailSo\Base\Loader::Init();
if (!\function_exists('yaml_parse')) {
include RAINLOOP_APP_LIBRARIES_PATH.'spyc/Spyc.php';
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) {
return \Spyc::YAMLLoad($filename);
return yaml_parse(\file_get_contents($filename));
}
}

1
rainloop/v/0.0.0/app/libraries/RainLoop/Utils.php
View file

@ -253,7 +253,6 @@ class Utils
{
if ('.yml' === substr($sFileName, -4))
{
//- $aLang = \yaml_parse(\str_replace(array(': >-', ': |-', ': |+'), array(': >', ': |', ': |'), \file_get_contents($sFileName)));
$aLang = \yaml_parse_file($sFileName);
if (\is_array($aLang))
{