Passed
Pull Request — release-2.1 (#7114)
by
unknown
04:51
created
other/install.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
90 90
 				return false;
91 91
 		},
92 92
 		'utf8_version' => '8.0',
93
-		'utf8_version_check' => function (){
93
+		'utf8_version_check' => function() {
94 94
 			$request = pg_query('SELECT version()');
95 95
 			list ($version) = pg_fetch_row($request);
96 96
 			list($pgl, $version) = explode(' ', $version);
@@ -981,7 +981,7 @@  discard block
 block discarded – undo
981 981
 	$incontext['continue'] = 1;
982 982
 
983 983
 	// Check Postgres setting
984
-	if ( $db_type === 'postgresql')
984
+	if ($db_type === 'postgresql')
985 985
 	{
986 986
 		load_database();
987 987
 		$result = $smcFunc['db_query']('', '
Please login to merge, or discard this patch.
Braces   +9 added lines, -5 removed lines patch added patch discarded remove patch
@@ -40,7 +40,8 @@  discard block
 block discarded – undo
40 40
 	'mysql' => array(
41 41
 		'name' => 'MySQL',
42 42
 		'version' => '5.6.0',
43
-		'version_check' => function() {
43
+		'version_check' => function()
44
+		{
44 45
 			global $db_connection;
45 46
 			if (!function_exists('mysqli_fetch_row'))
46 47
 				return false;
@@ -56,7 +57,8 @@  discard block
 block discarded – undo
56 57
 			return true;
57 58
 		},
58 59
 		'utf8_version' => '5.0.22',
59
-		'utf8_version_check' => function() {
60
+		'utf8_version_check' => function()
61
+		{
60 62
 			global $db_connection;
61 63
 			return mysqli_get_server_info($db_connection);
62 64
 		},
@@ -70,7 +72,8 @@  discard block
 block discarded – undo
70 72
 	'postgresql' => array(
71 73
 		'name' => 'PostgreSQL',
72 74
 		'version' => '9.6',
73
-		'version_check' => function() {
75
+		'version_check' => function()
76
+		{
74 77
 			$request = pg_query('SELECT version()');
75 78
 			list ($version) = pg_fetch_row($request);
76 79
 			list($pgl, $version) = explode(' ', $version);
@@ -90,7 +93,8 @@  discard block
 block discarded – undo
90 93
 				return false;
91 94
 		},
92 95
 		'utf8_version' => '8.0',
93
-		'utf8_version_check' => function (){
96
+		'utf8_version_check' => function ()
97
+		{
94 98
 			$request = pg_query('SELECT version()');
95 99
 			list ($version) = pg_fetch_row($request);
96 100
 			list($pgl, $version) = explode(' ', $version);
@@ -995,7 +999,7 @@  discard block
 block discarded – undo
995 999
 		{
996 1000
 			$row = $smcFunc['db_fetch_assoc']($result);
997 1001
 			if ($row['standard_conforming_strings'] !== 'on')
998
-				{
1002
+			{
999 1003
 					$incontext['continue'] = 0;
1000 1004
 					$incontext['error'] = $txt['error_pg_scs'];
1001 1005
 				}
Please login to merge, or discard this patch.
Sources/Subs-Charset.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -2917,7 +2917,7 @@  discard block
 block discarded – undo
2917 2917
 	$string = preg_split('/(.)/su', $string, 0, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
2918 2918
 
2919 2919
 	// Replace characters with decomposed forms.
2920
-	for ($i=0; $i < count($string); $i++)
2920
+	for ($i = 0; $i < count($string); $i++)
2921 2921
 	{
2922 2922
 		// Hangul characters.
2923 2923
 		if ($string[$i] >= "\xEA\xB0\x80" && $string[$i] <= "\xED\x9E\xA3")
@@ -2951,7 +2951,7 @@  discard block
 block discarded – undo
2951 2951
 		{
2952 2952
 			$temp = $string[$i];
2953 2953
 			$string[$i] = $string[$i - 1];
2954
-			$string[$i -1] = $temp;
2954
+			$string[$i - 1] = $temp;
2955 2955
 
2956 2956
 			// Backtrack and check again.
2957 2957
 			if ($i > 1)
@@ -3262,7 +3262,7 @@  discard block
 block discarded – undo
3262 3262
 
3263 3263
 		Regex source is https://unicode.org/reports/tr51/#EBNF_and_Regex
3264 3264
 	*/
3265
-	$string  = mb_ereg_replace_callback(
3265
+	$string = mb_ereg_replace_callback(
3266 3266
 		'\p{Regional_Indicator}\p{Regional_Indicator}' .
3267 3267
 		'|' .
3268 3268
 		'\p{Emoji}' .
@@ -3283,7 +3283,7 @@  discard block
 block discarded – undo
3283 3283
 				'[\x{E0020}-\x{E007E}]+\x{E007F}' .
3284 3284
 			')?' .
3285 3285
 		')*',
3286
-		function ($matches) use (&$placeholders)
3286
+		function($matches) use (&$placeholders)
3287 3287
 		{
3288 3288
 			// Skip lone ASCII characters that are not actully part of an emoji sequence.
3289 3289
 			// This can happen because the digits 0-9 and the '*' and '#' characters are
@@ -3658,7 +3658,7 @@  discard block
 block discarded – undo
3658 3658
 			// Do the thing.
3659 3659
 			$temp = @mb_ereg_replace_callback(
3660 3660
 				$pattern,
3661
-				function ($matches) use ($placeholders)
3661
+				function($matches) use ($placeholders)
3662 3662
 				{
3663 3663
 					return strtr($matches[0], $placeholders);
3664 3664
 				},
Please login to merge, or discard this patch.