@@ -1219,7 +1219,8 @@ discard block |
||
1219 | 1219 | } |
1220 | 1220 | |
1221 | 1221 | // It's important to do the numbered ones before the named ones, or messes happen. |
1222 | - uksort($substitutions, function($a, $b) { |
|
1222 | + uksort($substitutions, function($a, $b) |
|
1223 | + { |
|
1223 | 1224 | if (is_int($a) && is_int($b)) |
1224 | 1225 | return $a > $b ? 1 : ($a < $b ? -1 : 0); |
1225 | 1226 | elseif (is_int($a)) |
@@ -1758,8 +1759,12 @@ discard block |
||
1758 | 1759 | unset($mtime, $settingsFile, $settingsText); |
1759 | 1760 | $defined_vars = get_defined_vars(); |
1760 | 1761 | } |
1761 | - catch (Throwable $e) {} |
|
1762 | - catch (ErrorException $e) {} |
|
1762 | + catch (Throwable $e) |
|
1763 | + { |
|
1764 | +} |
|
1765 | + catch (ErrorException $e) |
|
1766 | + { |
|
1767 | +} |
|
1763 | 1768 | if (isset($e)) |
1764 | 1769 | return false; |
1765 | 1770 | |
@@ -1915,7 +1920,8 @@ discard block |
||
1915 | 1920 | // For the same reason, replace literal returns and newlines with "\r" and "\n" |
1916 | 1921 | elseif (is_string($var) && (strpos($var, "\n") !== false || strpos($var, "\r") !== false)) |
1917 | 1922 | { |
1918 | - return strtr(preg_replace_callback('/[\r\n]+/', function($m) { |
|
1923 | + return strtr(preg_replace_callback('/[\r\n]+/', function($m) |
|
1924 | + { |
|
1919 | 1925 | return '\' . "' . strtr($m[0], array("\r" => '\r', "\n" => '\n')) . '" . \''; |
1920 | 1926 | }, $var), array("'' . " => '', " . ''" => '')); |
1921 | 1927 | } |