@@ -1232,7 +1232,8 @@ discard block |
||
1232 | 1232 | } |
1233 | 1233 | |
1234 | 1234 | // It's important to do the numbered ones before the named ones, or messes happen. |
1235 | - uksort($substitutions, function($a, $b) { |
|
1235 | + uksort($substitutions, function($a, $b) |
|
1236 | + { |
|
1236 | 1237 | if (is_int($a) && is_int($b)) |
1237 | 1238 | return $a > $b ? 1 : ($a < $b ? -1 : 0); |
1238 | 1239 | elseif (is_int($a)) |
@@ -1771,8 +1772,12 @@ discard block |
||
1771 | 1772 | unset($mtime, $settingsFile, $settingsText); |
1772 | 1773 | $defined_vars = get_defined_vars(); |
1773 | 1774 | } |
1774 | - catch (Throwable $e) {} |
|
1775 | - catch (ErrorException $e) {} |
|
1775 | + catch (Throwable $e) |
|
1776 | + { |
|
1777 | +} |
|
1778 | + catch (ErrorException $e) |
|
1779 | + { |
|
1780 | +} |
|
1776 | 1781 | if (isset($e)) |
1777 | 1782 | return false; |
1778 | 1783 | |
@@ -1928,7 +1933,8 @@ discard block |
||
1928 | 1933 | // For the same reason, replace literal returns and newlines with "\r" and "\n" |
1929 | 1934 | elseif (is_string($var) && (strpos($var, "\n") !== false || strpos($var, "\r") !== false)) |
1930 | 1935 | { |
1931 | - return strtr(preg_replace_callback('/[\r\n]+/', function($m) { |
|
1936 | + return strtr(preg_replace_callback('/[\r\n]+/', function($m) |
|
1937 | + { |
|
1932 | 1938 | return '\' . "' . strtr($m[0], array("\r" => '\r', "\n" => '\n')) . '" . \''; |
1933 | 1939 | }, var_export($var, true)), array("'' . " => '', " . ''" => '')); |
1934 | 1940 | } |