@@ -1285,7 +1285,9 @@ |
||
| 1285 | 1285 | |
| 1286 | 1286 | $func_text = rtrim($func_text); |
| 1287 | 1287 | |
| 1288 | - $func_text .= $nextline . implode(' .' . $nextline, array_map(function ($v) { return var_export($v, true); }, $value)); |
|
| 1288 | + $func_text .= $nextline . implode(' .' . $nextline, array_map(function ($v) |
|
| 1289 | + { |
|
| 1290 | +return var_export($v, true); }, $value)); |
|
| 1289 | 1291 | } |
| 1290 | 1292 | else |
| 1291 | 1293 | { |
@@ -41,7 +41,8 @@ discard block |
||
| 41 | 41 | 'mysql' => array( |
| 42 | 42 | 'name' => 'MySQL', |
| 43 | 43 | 'version' => '5.6.0', |
| 44 | - 'version_check' => function() { |
|
| 44 | + 'version_check' => function() |
|
| 45 | + { |
|
| 45 | 46 | global $db_connection; |
| 46 | 47 | if (!function_exists('mysqli_fetch_row')) |
| 47 | 48 | return false; |
@@ -52,7 +53,8 @@ discard block |
||
| 52 | 53 | 'postgresql' => array( |
| 53 | 54 | 'name' => 'PostgreSQL', |
| 54 | 55 | 'version' => '9.6', |
| 55 | - 'version_check' => function() { |
|
| 56 | + 'version_check' => function() |
|
| 57 | + { |
|
| 56 | 58 | if (!function_exists('pg_version')) |
| 57 | 59 | return false; |
| 58 | 60 | $version = pg_version(); |
@@ -1091,22 +1093,30 @@ discard block |
||
| 1091 | 1093 | |
| 1092 | 1094 | // PHP currently has a terrible handling with unserialize in which errors are fatal and not catchable. Lets borrow some code from the RFC that intends to fix this |
| 1093 | 1095 | // https://wiki.php.net/rfc/improve_unserialize_error_handling |
| 1094 | - try { |
|
| 1095 | - set_error_handler(static function ($severity, $message, $file, $line) { |
|
| 1096 | + try |
|
| 1097 | + { |
|
| 1098 | + set_error_handler(static function ($severity, $message, $file, $line) |
|
| 1099 | + { |
|
| 1096 | 1100 | throw new \ErrorException($message, 0, $severity, $file, $line); |
| 1097 | 1101 | }); |
| 1098 | 1102 | $ser_test = @unserialize($modSettings['attachmentUploadDir']); |
| 1099 | - } catch (\Throwable $e) { |
|
| 1103 | + } |
|
| 1104 | + catch (\Throwable $e) |
|
| 1105 | + { |
|
| 1100 | 1106 | $ser_test = false; |
| 1101 | 1107 | } |
| 1102 | - finally { |
|
| 1108 | + finally |
|
| 1109 | + { |
|
| 1103 | 1110 | restore_error_handler(); |
| 1104 | 1111 | } |
| 1105 | 1112 | |
| 1106 | 1113 | // Json is simple, it can be caught. |
| 1107 | - try { |
|
| 1114 | + try |
|
| 1115 | + { |
|
| 1108 | 1116 | $json_test = @json_decode($modSettings['attachmentUploadDir'], true); |
| 1109 | - } catch (\Throwable $e) { |
|
| 1117 | + } |
|
| 1118 | + catch (\Throwable $e) |
|
| 1119 | + { |
|
| 1110 | 1120 | $json_test = null; |
| 1111 | 1121 | } |
| 1112 | 1122 | |