@@ -893,7 +893,8 @@ discard block |
||
893 | 893 | if ($smcFunc['db_num_rows']($request) != 0) |
894 | 894 | $duplicateMail = true; |
895 | 895 | |
896 | - if (isset($duplicateName) || isset($duplicateMail)){ |
|
896 | + if (isset($duplicateName) || isset($duplicateMail)) |
|
897 | + { |
|
897 | 898 | global $db_prefix; |
898 | 899 | return throw_error(sprintf($txt['error_duplicate_members'], $db_prefix)); |
899 | 900 | } |
@@ -3377,7 +3378,9 @@ discard block |
||
3377 | 3378 | return $string; |
3378 | 3379 | |
3379 | 3380 | // This bit fixes incorrect string lengths, which can happen if the character encoding was changed (e.g. conversion to UTF-8) |
3380 | - $new_string = preg_replace_callback('~\bs:(\d+):"(.*?)";(?=$|[bidsa]:|[{}]|N;)~s', function ($matches) {return 's:' . strlen($matches[2]) . ':"' . $matches[2] . '";';}, $string); |
|
3381 | + $new_string = preg_replace_callback('~\bs:(\d+):"(.*?)";(?=$|[bidsa]:|[{}]|N;)~s', function ($matches) |
|
3382 | + { |
|
3383 | +return 's:' . strlen($matches[2]) . ':"' . $matches[2] . '";';}, $string); |
|
3381 | 3384 | |
3382 | 3385 | // @todo Add more possible fixes here. For example, fix incorrect array lengths, try to handle truncated strings gracefully, etc. |
3383 | 3386 |