Passed
Pull Request — release-2.1 (#7314)
by John
05:29
created
ssi_examples.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -89,7 +89,9 @@
 block discarded – undo
89 89
 						<li><a href="#" onclick="showSSIBlock('ssi_quickSearch'); return false;">Quick Search Box</a></li>
90 90
 						<li><a href="#" onclick="showSSIBlock('ssi_recentAttachments'); return false;">Recent Attachments</a></li>
91 91
 					</ul>
92
-					<?php if ($user_info['is_admin']) { ?>
92
+					<?php if ($user_info['is_admin'])
93
+{
94
+?>
93 95
 					<h3>Advanced Functions <img class="help" title="Functions that require additional tweaking, not just copy and paste." src="<?php echo $settings['images_url']; ?>/helptopics.png" alt=""></h3>
94 96
 					<ul>
95 97
 						<li><a href="#" onclick="showSSIBlock('ssi_showPoll'); return false;">Show Single Poll</a></li>
Please login to merge, or discard this patch.
Themes/default/GenericControls.template.php 1 patch
Braces   +8 added lines, -4 removed lines patch added patch discarded remove patch
@@ -100,18 +100,22 @@
 block discarded – undo
100 100
 	$tempTab++;
101 101
 	$context['tabindex'] = $tempTab;
102 102
 
103
-	foreach ($context['richedit_buttons'] as $name => $button) {
104
-		if ($name == 'spell_check') {
103
+	foreach ($context['richedit_buttons'] as $name => $button)
104
+	{
105
+		if ($name == 'spell_check')
106
+		{
105 107
 			$button['onclick'] = 'oEditorHandle_' . $editor_id . '.spellCheckStart();';
106 108
 		}
107 109
 
108
-		if ($name == 'preview') {
110
+		if ($name == 'preview')
111
+		{
109 112
 			$button['value'] = isset($editor_context['labels']['preview_button']) ? $editor_context['labels']['preview_button'] : $button['value'];
110 113
 			$button['onclick'] = $editor_context['preview_type'] == 2 ? '' : 'return submitThisOnce(this);';
111 114
 			$button['show'] = $editor_context['preview_type'];
112 115
 		}
113 116
 
114
-		if ($button['show']) {
117
+		if ($button['show'])
118
+		{
115 119
 			echo '
116 120
 		<input type="', $button['type'], '"', $button['type'] == 'hidden' ? ' id="' . $name . '"' : '', ' name="', $name, '" value="', $button['value'], '"', $button['type'] != 'hidden' ? ' tabindex="' . --$tempTab . '"' : '', !empty($button['onclick']) ? ' onclick="' . $button['onclick'] . '"' : '', !empty($button['accessKey']) ? ' accesskey="' . $button['accessKey'] . '"' : '', $button['type'] != 'hidden' ? ' class="button"' : '', '>';
117 121
 		}
Please login to merge, or discard this patch.
Sources/Security.php 1 patch
Braces   -4 removed lines patch added patch discarded remove patch
@@ -1257,7 +1257,6 @@  discard block
 block discarded – undo
1257 1257
 
1258 1258
 			continue;
1259 1259
 		}
1260
-
1261 1260
 		else
1262 1261
 		{
1263 1262
 			$fh = @fopen($path . '/.htaccess', 'w');
@@ -1269,7 +1268,6 @@  discard block
 block discarded – undo
1269 1268
 	Deny from all' . $close);
1270 1269
 				fclose($fh);
1271 1270
 			}
1272
-
1273 1271
 			else
1274 1272
 				$errors[] = 'htaccess_cannot_create_file';
1275 1273
 		}
@@ -1280,7 +1278,6 @@  discard block
 block discarded – undo
1280 1278
 
1281 1279
 			continue;
1282 1280
 		}
1283
-
1284 1281
 		else
1285 1282
 		{
1286 1283
 			$fh = @fopen($path . '/index.php', 'w');
@@ -1307,7 +1304,6 @@  discard block
 block discarded – undo
1307 1304
 ?' . '>');
1308 1305
 				fclose($fh);
1309 1306
 			}
1310
-
1311 1307
 			else
1312 1308
 				$errors[] = 'index-php_cannot_create_file';
1313 1309
 		}
Please login to merge, or discard this patch.
Sources/SplitTopics.php 1 patch
Braces   -1 removed lines patch added patch discarded remove patch
@@ -869,7 +869,6 @@
 block discarded – undo
869 869
 		$can_approve_boards = boardsAllowedTo('approve_posts');
870 870
 		$onlyApproved = $can_approve_boards !== array(0) && !in_array($_REQUEST['targetboard'], $can_approve_boards);
871 871
 	}
872
-
873 872
 	else
874 873
 		$onlyApproved = false;
875 874
 
Please login to merge, or discard this patch.
cron.php 1 patch
Braces   -1 removed lines patch added patch discarded remove patch
@@ -93,7 +93,6 @@
 block discarded – undo
93 93
 	if ($ts <= 0 || $ts % 15 != 0 || time() - $ts < 0 || time() - $ts > 20)
94 94
 		obExit_cron();
95 95
 }
96
-
97 96
 else
98 97
 	$_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.0';
99 98
 
Please login to merge, or discard this patch.
Sources/tasks/CreatePost-Notify.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -174,7 +174,8 @@
 block discarded – undo
174 174
 			}
175 175
 		}
176 176
 
177
-		$unnotified = array_filter($this->members['watching'], function ($member) {
177
+		$unnotified = array_filter($this->members['watching'], function ($member)
178
+		{
178 179
 			return empty($member['sent']);
179 180
 		});
180 181
 
Please login to merge, or discard this patch.
Sources/Subs.php 1 patch
Braces   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -280,7 +280,6 @@  discard block
 block discarded – undo
280 280
 		$condition = 'id_member IN ({array_int:members})';
281 281
 		$parameters['members'] = $members;
282 282
 	}
283
-
284 283
 	elseif ($members === null)
285 284
 		$condition = '1=1';
286 285
 
@@ -383,11 +382,9 @@  discard block
 block discarded – undo
383 382
 				$val = $val . ' END';
384 383
 				$type = 'raw';
385 384
 			}
386
-
387 385
 			else
388 386
 				$val = alert_count($members, true);
389 387
 		}
390
-
391 388
 		elseif ($type == 'int' && ($val === '+' || $val === '-'))
392 389
 		{
393 390
 			$val = $var . ' ' . $val . ' 1';
@@ -2167,12 +2164,12 @@  discard block
 block discarded – undo
2167 2164
 			'tag' => 'cowsay',
2168 2165
 			'parameters' => array(
2169 2166
 				'e' => array('optional' => true, 'quoted' => true, 'match' => '(.*?)', 'default' => 'oo', 'validate' => function ($eyes) use ($smcFunc)
2170
-					{
2167
+				{
2171 2168
 						return $smcFunc['substr']($eyes . 'oo', 0, 2);
2172 2169
 					},
2173 2170
 				),
2174 2171
 				't' => array('optional' => true, 'quoted' => true, 'match' => '(.*?)', 'default' => '  ', 'validate' => function ($tongue) use ($smcFunc)
2175
-					{
2172
+				{
2176 2173
 						return $smcFunc['substr']($tongue . '  ', 0, 2);
2177 2174
 					},
2178 2175
 				),
@@ -2500,7 +2497,8 @@  discard block
 block discarded – undo
2500 2497
 
2501 2498
 							foreach (array('path', 'query', 'fragment') as $part)
2502 2499
 							{
2503
-								switch ($part) {
2500
+								switch ($part)
2501
+								{
2504 2502
 									case 'path':
2505 2503
 										$part_disallowed_chars = '\h\v<>' . $bracket_quote_chars . $excluded_trailing_chars . '/#&';
2506 2504
 										$part_excluded_trailing_chars = str_replace('?', '', $excluded_trailing_chars);
@@ -2817,7 +2815,9 @@  discard block
 block discarded – undo
2817 2815
 			$look_for = strtolower(substr($message, $pos + 2, $pos2 - $pos - 2));
2818 2816
 
2819 2817
 			// A closing tag that doesn't match any open tags? Skip it.
2820
-			if (!in_array($look_for, array_map(function($code) { return $code['tag']; }, $open_tags)))
2818
+			if (!in_array($look_for, array_map(function($code)
2819
+			{
2820
+return $code['tag']; }, $open_tags)))
2821 2821
 				continue;
2822 2822
 
2823 2823
 			$to_close = array();
@@ -4357,7 +4357,6 @@  discard block
 block discarded – undo
4357 4357
 				if (!isset($minSeed) && isset($js_file['options']['seed']))
4358 4358
 					$minSeed = $js_file['options']['seed'];
4359 4359
 			}
4360
-
4361 4360
 			else
4362 4361
 			{
4363 4362
 				echo '
@@ -6287,7 +6286,8 @@  discard block
 block discarded – undo
6287 6286
 			$zones[$tzkey]['tzid'] = $tzid;
6288 6287
 			$zones[$tzkey]['dst_type'] = count($tzinfo) > 1 ? 1 : ($tzinfo[0]['isdst'] ? 2 : 0);
6289 6288
 
6290
-			foreach ($tzinfo as $transition) {
6289
+			foreach ($tzinfo as $transition)
6290
+			{
6291 6291
 				$zones[$tzkey]['abbrs'][] = $transition['abbr'];
6292 6292
 			}
6293 6293
 
@@ -6791,7 +6791,6 @@  discard block
 block discarded – undo
6791 6791
 			$isWritable = true;
6792 6792
 			break;
6793 6793
 		}
6794
-
6795 6794
 		else
6796 6795
 			@chmod($file, $val);
6797 6796
 	}
@@ -7880,7 +7879,8 @@  discard block
 block discarded – undo
7880 7879
 	$replaceWith = array();
7881 7880
 
7882 7881
 	if (!empty($matches[1]))
7883
-		foreach ($matches[1] as $token) {
7882
+		foreach ($matches[1] as $token)
7883
+		{
7884 7884
 			$toFind[] = '{' . $token . '}';
7885 7885
 			$replaceWith[] = isset($txt[$token]) ? $txt[$token] : $token;
7886 7886
 		}
Please login to merge, or discard this patch.
other/upgrade.php 1 patch
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -41,7 +41,8 @@  discard block
 block discarded – undo
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
 block discarded – undo
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();
Please login to merge, or discard this patch.
Sources/ManageMaintenance.php 1 patch
Braces   -1 removed lines patch added patch discarded remove patch
@@ -2214,7 +2214,6 @@
 block discarded – undo
2214 2214
 		$hookData['pureFunc'] = $hookData['method'];
2215 2215
 		$hookData['call'] = $modFunc;
2216 2216
 	}
2217
-
2218 2217
 	else
2219 2218
 		$hookData['call'] = $hookData['pureFunc'] = $modFunc;
2220 2219
 
Please login to merge, or discard this patch.