@@ -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 : 0; |
1225 | 1226 | elseif (is_int($a)) |
@@ -1761,8 +1762,12 @@ discard block |
||
1761 | 1762 | unset($mtime, $settingsFile, $settingsText); |
1762 | 1763 | $defined_vars = get_defined_vars(); |
1763 | 1764 | } |
1764 | - catch (Throwable $e) {} |
|
1765 | - catch (ErrorException $e) {} |
|
1765 | + catch (Throwable $e) |
|
1766 | + { |
|
1767 | +} |
|
1768 | + catch (ErrorException $e) |
|
1769 | + { |
|
1770 | +} |
|
1766 | 1771 | if (isset($e)) |
1767 | 1772 | return false; |
1768 | 1773 | |
@@ -1918,7 +1923,8 @@ discard block |
||
1918 | 1923 | // For the same reason, replace literal returns and newlines with "\r" and "\n" |
1919 | 1924 | elseif (is_string($var) && (strpos($var, "\n") !== false || strpos($var, "\r") !== false)) |
1920 | 1925 | { |
1921 | - return strtr(preg_replace_callback('/[\r\n]+/', function($m) { |
|
1926 | + return strtr(preg_replace_callback('/[\r\n]+/', function($m) |
|
1927 | + { |
|
1922 | 1928 | return '\' . "' . strtr($m[0], array("\r" => '\r', "\n" => '\n')) . '" . \''; |
1923 | 1929 | }, $var), array("'' . " => '', " . ''" => '')); |
1924 | 1930 | } |