From 102b6c248b9696aa5b7aa16d814198b8071b96f6 Mon Sep 17 00:00:00 2001 From: Romain Quetiez Date: Mon, 26 May 2014 14:45:07 +0000 Subject: [PATCH] #928 Setup crashing if async_retries is configured SVN:trunk[3174] --- core/config.class.inc.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/config.class.inc.php b/core/config.class.inc.php index d5e656a5e..ff124fb27 100644 --- a/core/config.class.inc.php +++ b/core/config.class.inc.php @@ -1754,14 +1754,14 @@ class Config /** * Pretty format a var_export'ed value so that (if possible) the identation is preserved on every line * @param mixed $value The value to export - * @param string $sIdentation The string to use to indent the text + * @param string $sIndentation The string to use to indent the text * @param bool $bForceIndentation Forces the identation (enven if it breaks/changes an eval, for example to ouput a value inside a comment) * @return string The indented export string */ - protected static function PrettyVarExport($value, $sIdentation, $bForceIndentation = false) + protected static function PrettyVarExport($value, $sIndentation, $bForceIndentation = false) { $sExport = var_export($value, true); - $sNiceExport = trim(preg_replace("/^/m", "\t\t\t", $sExport)); + $sNiceExport = str_replace(array("\r\n", "\n", "\r"), "\n".$sIndentation, trim($sExport)); if (!$bForceIndentation) { eval('$aImported='.$sNiceExport.';');