Passed
Pull Request — release-2.1 (#7213)
by Mathias
04:19
created
Sources/Cache/APIs/Sqlite.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -131,14 +131,14 @@  discard block
 block discarded – undo
131 131
 		$class_name = $this->getImplementationClassKeyName();
132 132
 		$class_name_txt_key = strtolower($class_name);
133 133
 
134
-		$config_vars[] = $txt['cache_'. $class_name_txt_key .'_settings'];
134
+		$config_vars[] = $txt['cache_' . $class_name_txt_key . '_settings'];
135 135
 		$config_vars[] = array(
136
-			'cachedir_'. $class_name_txt_key,
137
-			$txt['cachedir_'. $class_name_txt_key],
136
+			'cachedir_' . $class_name_txt_key,
137
+			$txt['cachedir_' . $class_name_txt_key],
138 138
 			'file',
139 139
 			'text',
140 140
 			36,
141
-			'cache_'. $class_name_txt_key .'_cachedir',
141
+			'cache_' . $class_name_txt_key . '_cachedir',
142 142
 		);
143 143
 
144 144
 		if (!isset($context['settings_post_javascript']))
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
 		$context['settings_post_javascript'] .= '
148 148
 			$("#cache_accelerator").change(function (e) {
149 149
 				var cache_type = e.currentTarget.value;
150
-				$("#cachedir_'. $class_name_txt_key .'").prop("disabled", cache_type != "'. $class_name .'");
150
+				$("#cachedir_'. $class_name_txt_key . '").prop("disabled", cache_type != "' . $class_name . '");
151 151
 			});';
152 152
 	}
153 153
 
Please login to merge, or discard this patch.
Sources/Profile-Modify.php 1 patch
Braces   +1 added lines, -3 removed lines patch added patch discarded remove patch
@@ -156,7 +156,6 @@  discard block
 block discarded – undo
156 156
 					$diff = $cur_profile['date_registered'] - strtotime(smf_strftime('%Y-%m-%d', $cur_profile['date_registered']));
157 157
 					$value = $value + $diff;
158 158
 				}
159
-
160 159
 				else
161 160
 					$value = $cur_profile['date_registered'];
162 161
 
@@ -507,7 +506,7 @@  discard block
 block discarded – undo
507 506
 						log_error(sprintf($txt['smiley_set_dir_not_found'], $set_names[array_search($set, $context['smiley_sets'])]));
508 507
 
509 508
 						$context['smiley_sets'] = array_filter($context['smiley_sets'], function($v) use ($set)
510
-							{
509
+						{
511 510
 								return $v != $set;
512 511
 							});
513 512
 					}
@@ -3518,7 +3517,6 @@  discard block
 block discarded – undo
3518 3517
 			}
3519 3518
 		}
3520 3519
 	}
3521
-
3522 3520
 	elseif (($value == 'upload' && allowedTo('profile_upload_avatar')) || $downloadedExternalAvatar)
3523 3521
 	{
3524 3522
 		if ((isset($_FILES['attachment']['name']) && $_FILES['attachment']['name'] != '') || $downloadedExternalAvatar)
Please login to merge, or discard this patch.
other/install.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
 				return false;
93 93
 		},
94 94
 		'utf8_version' => '8.0',
95
-		'utf8_version_check' => function (){
95
+		'utf8_version_check' => function() {
96 96
 			global $db_connection;
97 97
 			$request = pg_query($db_connection, 'SELECT version()');
98 98
 			list ($version) = pg_fetch_row($request);
@@ -987,7 +987,7 @@  discard block
 block discarded – undo
987 987
 	$incontext['continue'] = 1;
988 988
 
989 989
 	// Check Postgres setting
990
-	if ( $db_type === 'postgresql')
990
+	if ($db_type === 'postgresql')
991 991
 	{
992 992
 		load_database();
993 993
 		$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
 			global $db_connection;
75 78
 			$request = pg_query($db_connection, 'SELECT version()');
76 79
 			list ($version) = pg_fetch_row($request);
@@ -92,7 +95,8 @@  discard block
 block discarded – undo
92 95
 				return false;
93 96
 		},
94 97
 		'utf8_version' => '8.0',
95
-		'utf8_version_check' => function (){
98
+		'utf8_version_check' => function ()
99
+		{
96 100
 			global $db_connection;
97 101
 			$request = pg_query($db_connection, 'SELECT version()');
98 102
 			list ($version) = pg_fetch_row($request);
@@ -1001,7 +1005,7 @@  discard block
 block discarded – undo
1001 1005
 		{
1002 1006
 			$row = $smcFunc['db_fetch_assoc']($result);
1003 1007
 			if ($row['standard_conforming_strings'] !== 'on')
1004
-				{
1008
+			{
1005 1009
 					$incontext['continue'] = 0;
1006 1010
 					$incontext['error'] = $txt['error_pg_scs'];
1007 1011
 				}
Please login to merge, or discard this patch.
Sources/Calendar.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -144,7 +144,7 @@
 block discarded – undo
144 144
 
145 145
 	$end_object = null;
146 146
 
147
-	if ( (!empty($end_year) && !empty($end_month) && !empty($end_day)) && checkdate($end_month, $end_day, $end_year)) {
147
+	if ((!empty($end_year) && !empty($end_month) && !empty($end_day)) && checkdate($end_month, $end_day, $end_year)) {
148 148
 		$end_object = date_create(implode('-', array($end_year, $end_month, $end_day)));
149 149
 	} 
150 150
 
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -144,7 +144,8 @@
 block discarded – undo
144 144
 
145 145
 	$end_object = null;
146 146
 
147
-	if ( (!empty($end_year) && !empty($end_month) && !empty($end_day)) && checkdate($end_month, $end_day, $end_year)) {
147
+	if ( (!empty($end_year) && !empty($end_month) && !empty($end_day)) && checkdate($end_month, $end_day, $end_year))
148
+	{
148 149
 		$end_object = date_create(implode('-', array($end_year, $end_month, $end_day)));
149 150
 	} 
150 151
 
Please login to merge, or discard this patch.