From 957ccfeb3bc21a091d29494b6d9d10382be78e8e Mon Sep 17 00:00:00 2001 From: djmaze Date: Tue, 7 Jul 2020 13:47:19 +0200 Subject: [PATCH] Cleanup yaml parsing --- rainloop/v/0.0.0/app/handle.php | 6 +++--- rainloop/v/0.0.0/app/libraries/RainLoop/Utils.php | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/rainloop/v/0.0.0/app/handle.php b/rainloop/v/0.0.0/app/handle.php index 2a8436f4e..7a99d36bc 100644 --- a/rainloop/v/0.0.0/app/handle.php +++ b/rainloop/v/0.0.0/app/handle.php @@ -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)); } } diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Utils.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Utils.php index a3facb2b0..ad7449f97 100644 --- a/rainloop/v/0.0.0/app/libraries/RainLoop/Utils.php +++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Utils.php @@ -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)) {