Passed
Pull Request — release-2.1 (#7133)
by Mert
04:19
created
Sources/Subs-Timezones.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1716,7 +1716,7 @@
 block discarded – undo
1716 1716
 		{
1717 1717
 			usort(
1718 1718
 				$fallbacks[$tzid],
1719
-				function ($a, $b)
1719
+				function($a, $b)
1720 1720
 				{
1721 1721
 					return $a['ts'] > $b['ts'];
1722 1722
 				}
Please login to merge, or discard this patch.
Sources/ManagePermissions.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1840,7 +1840,7 @@
 block discarded – undo
1840 1840
 		// Make sure this is an array of integers
1841 1841
 		$excluded_groups = array_filter(
1842 1842
 			(array) $excluded_groups,
1843
-			function ($v)
1843
+			function($v)
1844 1844
 			{
1845 1845
 				return is_int($v) || is_string($v) && (string) intval($v) === $v;
1846 1846
 			}
Please login to merge, or discard this patch.
Themes/default/Admin.template.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -758,7 +758,7 @@
 block discarded – undo
758 758
 	// Filter out any redundant separators before we start the loop
759 759
 	$context['config_vars'] = array_filter(
760 760
 		$context['config_vars'],
761
-		function ($v) use ($context)
761
+		function($v) use ($context)
762 762
 		{
763 763
 			static $config_vars, $prev;
764 764
 
Please login to merge, or discard this patch.
Themes/default/PersonalMessage.template.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -277,7 +277,7 @@  discard block
 block discarded – undo
277 277
 	global $context, $scripturl, $txt, $settings, $options, $modSettings;
278 278
 
279 279
 	echo '
280
-	<div class="windowbg" id="msg', $message['id'],'">
280
+	<div class="windowbg" id="msg', $message['id'], '">
281 281
 		<div class="post_wrapper">
282 282
 			<div class="poster">';
283 283
 
@@ -1946,7 +1946,7 @@  discard block
 block discarded – undo
1946 1946
 				<div class="floatright smalltext righttext">
1947 1947
 					<div class="recipient_to">&#171;&nbsp;<strong>', $txt['to'], ':</strong> ', implode(', ', $draft['recipients']['to']), '&nbsp;&#187;</div>';
1948 1948
 
1949
-			if(!empty($draft['recipients']['bcc']))
1949
+			if (!empty($draft['recipients']['bcc']))
1950 1950
 				echo'
1951 1951
 					<div class="pm_bbc">&#171;&nbsp;<strong>', $txt['pm_bcc'], ':</strong> ', implode(', ', $draft['recipients']['bcc']), '&nbsp;&#187;</div>';
1952 1952
 
Please login to merge, or discard this patch.
Sources/Subs.php 2 patches
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.
Spacing   +39 added lines, -39 removed lines patch added patch discarded remove patch
@@ -378,7 +378,7 @@  discard block
 block discarded – undo
378 378
 			{
379 379
 				$val = 'CASE ';
380 380
 				foreach ($members as $k => $v)
381
-					$val .= 'WHEN id_member = ' . $v . ' THEN '. alert_count($v, true) . ' ';
381
+					$val .= 'WHEN id_member = ' . $v . ' THEN ' . alert_count($v, true) . ' ';
382 382
 
383 383
 				$val = $val . ' END';
384 384
 				$type = 'raw';
@@ -1045,11 +1045,11 @@  discard block
 block discarded – undo
1045 1045
 			// Anything that isn't a specification, punctuation mark, or whitespace.
1046 1046
 			'~(?<!%)\p{L}|[^\p{L}\p{P}\s]~u',
1047 1047
 			// A series of punctuation marks (except %), possibly separated by whitespace.
1048
-			'~([^%\P{P}])(\s*)(?'.'>(\1|[^%\P{Po}])\s*(?!$))*~u',
1048
+			'~([^%\P{P}])(\s*)(?' . '>(\1|[^%\P{Po}])\s*(?!$))*~u',
1049 1049
 			// Unwanted trailing punctuation and whitespace.
1050
-			'~(?'.'>([\p{Pd}\p{Ps}\p{Pi}\p{Pc}]|[^%\P{Po}])\s*)*$~u',
1050
+			'~(?' . '>([\p{Pd}\p{Ps}\p{Pi}\p{Pc}]|[^%\P{Po}])\s*)*$~u',
1051 1051
 			// Unwanted opening punctuation and whitespace.
1052
-			'~^\s*(?'.'>([\p{Pd}\p{Pe}\p{Pf}\p{Pc}]|[^%\P{Po}])\s*)*~u',
1052
+			'~^\s*(?' . '>([\p{Pd}\p{Pe}\p{Pf}\p{Pc}]|[^%\P{Po}])\s*)*~u',
1053 1053
 		),
1054 1054
 		array(
1055 1055
 			'',
@@ -1139,7 +1139,7 @@  discard block
 block discarded – undo
1139 1139
 	elseif (!empty($context['character_set']) && is_callable('mb_decode_numericentity'))
1140 1140
 	{
1141 1141
 		// Get whatever the default replacement character is for this encoding.
1142
-		$substitute = mb_decode_numericentity('&#xFFFD;', array(0xFFFD,0xFFFD,0,0xFFFF), $context['character_set']);
1142
+		$substitute = mb_decode_numericentity('&#xFFFD;', array(0xFFFD, 0xFFFD, 0, 0xFFFF), $context['character_set']);
1143 1143
 	}
1144 1144
 	else
1145 1145
 		$substitute = '?';
@@ -1624,7 +1624,7 @@  discard block
 block discarded – undo
1624 1624
 								$returnContext .= '<img src="' . $currentAttachment['href'] . '"' . $alt . $title . ' class="bbc_img">';
1625 1625
 							else
1626 1626
 							{
1627
-								$width = !empty($params['{width}']) ? ' width="' . $params['{width}'] . '"': '';
1627
+								$width = !empty($params['{width}']) ? ' width="' . $params['{width}'] . '"' : '';
1628 1628
 								$height = !empty($params['{height}']) ? 'height="' . $params['{height}'] . '"' : '';
1629 1629
 								$returnContext .= '<img src="' . $currentAttachment['href'] . ';image"' . $alt . $title . $width . $height . ' class="bbc_img resized"/>';
1630 1630
 							}
@@ -1635,7 +1635,7 @@  discard block
 block discarded – undo
1635 1635
 							$width = !empty($params['{width}']) ? ' width="' . $params['{width}'] . '"' : '';
1636 1636
 							$height = !empty($params['{height}']) ? ' height="' . $params['{height}'] . '"' : '';
1637 1637
 
1638
-							$returnContext .= '<div class="videocontainer"><video controls preload="metadata" src="'. $currentAttachment['href'] . '" playsinline' . $width . $height . '><a href="' . $currentAttachment['href'] . '" class="bbc_link">' . $smcFunc['htmlspecialchars'](!empty($data) ? $data : $currentAttachment['name']) . '</a></video></div>' . (!empty($data) && $data != $currentAttachment['name'] ? '<div class="smalltext">' . $data . '</div>' : '');
1638
+							$returnContext .= '<div class="videocontainer"><video controls preload="metadata" src="' . $currentAttachment['href'] . '" playsinline' . $width . $height . '><a href="' . $currentAttachment['href'] . '" class="bbc_link">' . $smcFunc['htmlspecialchars'](!empty($data) ? $data : $currentAttachment['name']) . '</a></video></div>' . (!empty($data) && $data != $currentAttachment['name'] ? '<div class="smalltext">' . $data . '</div>' : '');
1639 1639
 						}
1640 1640
 						// Audio.
1641 1641
 						elseif (strpos($currentAttachment['mime_type'], 'audio/') === 0)
@@ -1643,7 +1643,7 @@  discard block
 block discarded – undo
1643 1643
 							$width = 'max-width:100%; width: ' . (!empty($params['{width}']) ? $params['{width}'] : '400') . 'px;';
1644 1644
 							$height = !empty($params['{height}']) ? 'height: ' . $params['{height}'] . 'px;' : '';
1645 1645
 
1646
-							$returnContext .= (!empty($data) && $data != $currentAttachment['name'] ? $data . ' ' : '') . '<audio controls preload="none" src="'. $currentAttachment['href'] . '" class="bbc_audio" style="vertical-align:middle;' . $width . $height . '"><a href="' . $currentAttachment['href'] . '" class="bbc_link">' . $smcFunc['htmlspecialchars'](!empty($data) ? $data : $currentAttachment['name']) . '</a></audio>';
1646
+							$returnContext .= (!empty($data) && $data != $currentAttachment['name'] ? $data . ' ' : '') . '<audio controls preload="none" src="' . $currentAttachment['href'] . '" class="bbc_audio" style="vertical-align:middle;' . $width . $height . '"><a href="' . $currentAttachment['href'] . '" class="bbc_link">' . $smcFunc['htmlspecialchars'](!empty($data) ? $data : $currentAttachment['name']) . '</a></audio>';
1647 1647
 						}
1648 1648
 						// Anything else.
1649 1649
 						else
@@ -1812,7 +1812,7 @@  discard block
 block discarded – undo
1812 1812
 				'type' => 'unparsed_commas_content',
1813 1813
 				'test' => '\d+,\d+\]',
1814 1814
 				'content' => '<a href="$1" target="_blank" rel="noopener">$1</a>',
1815
-				'validate' => function (&$tag, &$data, $disabled)
1815
+				'validate' => function(&$tag, &$data, $disabled)
1816 1816
 				{
1817 1817
 					$scheme = parse_url($data[0], PHP_URL_SCHEME);
1818 1818
 					if (empty($scheme))
@@ -1925,8 +1925,8 @@  discard block
 block discarded – undo
1925 1925
 					else
1926 1926
 						$url = get_proxied_url($url);
1927 1927
 
1928
-					$alt = !empty($params['{alt}']) ? ' alt="' . $params['{alt}']. '"' : ' alt=""';
1929
-					$title = !empty($params['{title}']) ? ' title="' . $params['{title}']. '"' : '';
1928
+					$alt = !empty($params['{alt}']) ? ' alt="' . $params['{alt}'] . '"' : ' alt=""';
1929
+					$title = !empty($params['{title}']) ? ' title="' . $params['{title}'] . '"' : '';
1930 1930
 
1931 1931
 					$data = isset($disabled[$tag['tag']]) ? $url : '<img src="' . $url . '"' . $alt . $title . $params['{width}'] . $params['{height}'] . ' class="bbc_img' . (!empty($params['{width}']) || !empty($params['{height}']) ? ' resized' : '') . '" loading="lazy">';
1932 1932
 				},
@@ -2343,12 +2343,12 @@  discard block
 block discarded – undo
2343 2343
 		$codes[] = array(
2344 2344
 			'tag' => 'cowsay',
2345 2345
 			'parameters' => array(
2346
-				'e' => array('optional' => true, 'quoted' => true, 'match' => '(.*?)', 'default' => 'oo', 'validate' => function ($eyes) use ($smcFunc)
2346
+				'e' => array('optional' => true, 'quoted' => true, 'match' => '(.*?)', 'default' => 'oo', 'validate' => function($eyes) use ($smcFunc)
2347 2347
 					{
2348 2348
 						return $smcFunc['substr']($eyes . 'oo', 0, 2);
2349 2349
 					},
2350 2350
 				),
2351
-				't' => array('optional' => true, 'quoted' => true, 'match' => '(.*?)', 'default' => '  ', 'validate' => function ($tongue) use ($smcFunc)
2351
+				't' => array('optional' => true, 'quoted' => true, 'match' => '(.*?)', 'default' => '  ', 'validate' => function($tongue) use ($smcFunc)
2352 2352
 					{
2353 2353
 						return $smcFunc['substr']($tongue . '  ', 0, 2);
2354 2354
 					},
@@ -4073,7 +4073,7 @@  discard block
 block discarded – undo
4073 4073
 		if ($fp != false)
4074 4074
 		{
4075 4075
 			// Send the HEAD request (since we don't have to worry about chunked, HTTP/1.1 is fine here.)
4076
-			fwrite($fp, 'HEAD /' . $match[2] . ' HTTP/1.1' . "\r\n" . 'Host: ' . $match[1] . "\r\n" . 'user-agent: '. SMF_USER_AGENT . "\r\n" . 'Connection: close' . "\r\n\r\n");
4076
+			fwrite($fp, 'HEAD /' . $match[2] . ' HTTP/1.1' . "\r\n" . 'Host: ' . $match[1] . "\r\n" . 'user-agent: ' . SMF_USER_AGENT . "\r\n" . 'Connection: close' . "\r\n\r\n");
4077 4077
 
4078 4078
 			// Read in the HTTP/1.1 or whatever.
4079 4079
 			$test = substr(fgets($fp, 11), -1);
@@ -4669,7 +4669,7 @@  discard block
 block discarded – undo
4669 4669
 
4670 4670
 	uasort(
4671 4671
 		$context['css_files'],
4672
-		function ($a, $b)
4672
+		function($a, $b)
4673 4673
 		{
4674 4674
 			return $a['options']['order_pos'] < $b['options']['order_pos'] ? -1 : ($a['options']['order_pos'] > $b['options']['order_pos'] ? 1 : 0);
4675 4675
 		}
@@ -5966,7 +5966,7 @@  discard block
 block discarded – undo
5966 5966
 			{
5967 5967
 				fwrite($fp, 'GET ' . ($match[6] !== '/' ? str_replace(' ', '%20', $match[6]) : '') . ' HTTP/1.0' . "\r\n");
5968 5968
 				fwrite($fp, 'Host: ' . $match[3] . (empty($match[5]) ? ($match[2] ? ':443' : '') : ':' . $match[5]) . "\r\n");
5969
-				fwrite($fp, 'user-agent: '. SMF_USER_AGENT . "\r\n");
5969
+				fwrite($fp, 'user-agent: ' . SMF_USER_AGENT . "\r\n");
5970 5970
 				if ($keep_alive)
5971 5971
 					fwrite($fp, 'connection: Keep-Alive' . "\r\n\r\n");
5972 5972
 				else
@@ -5976,7 +5976,7 @@  discard block
 block discarded – undo
5976 5976
 			{
5977 5977
 				fwrite($fp, 'POST ' . ($match[6] !== '/' ? $match[6] : '') . ' HTTP/1.0' . "\r\n");
5978 5978
 				fwrite($fp, 'Host: ' . $match[3] . (empty($match[5]) ? ($match[2] ? ':443' : '') : ':' . $match[5]) . "\r\n");
5979
-				fwrite($fp, 'user-agent: '. SMF_USER_AGENT . "\r\n");
5979
+				fwrite($fp, 'user-agent: ' . SMF_USER_AGENT . "\r\n");
5980 5980
 				if ($keep_alive)
5981 5981
 					fwrite($fp, 'connection: Keep-Alive' . "\r\n");
5982 5982
 				else
@@ -6225,13 +6225,13 @@  discard block
 block discarded – undo
6225 6225
 
6226 6226
 	// UTF-8 occurences of MS special characters
6227 6227
 	$findchars_utf8 = array(
6228
-		"\xe2\x80\x9a",	// single low-9 quotation mark
6229
-		"\xe2\x80\x9e",	// double low-9 quotation mark
6230
-		"\xe2\x80\xa6",	// horizontal ellipsis
6231
-		"\xe2\x80\x98",	// left single curly quote
6232
-		"\xe2\x80\x99",	// right single curly quote
6233
-		"\xe2\x80\x9c",	// left double curly quote
6234
-		"\xe2\x80\x9d",	// right double curly quote
6228
+		"\xe2\x80\x9a", // single low-9 quotation mark
6229
+		"\xe2\x80\x9e", // double low-9 quotation mark
6230
+		"\xe2\x80\xa6", // horizontal ellipsis
6231
+		"\xe2\x80\x98", // left single curly quote
6232
+		"\xe2\x80\x99", // right single curly quote
6233
+		"\xe2\x80\x9c", // left double curly quote
6234
+		"\xe2\x80\x9d", // right double curly quote
6235 6235
 	);
6236 6236
 
6237 6237
 	// windows 1252 / iso equivalents
@@ -6247,13 +6247,13 @@  discard block
 block discarded – undo
6247 6247
 
6248 6248
 	// safe replacements
6249 6249
 	$replacechars = array(
6250
-		',',	// &sbquo;
6251
-		',,',	// &bdquo;
6252
-		'...',	// &hellip;
6253
-		"'",	// &lsquo;
6254
-		"'",	// &rsquo;
6255
-		'"',	// &ldquo;
6256
-		'"',	// &rdquo;
6250
+		',', // &sbquo;
6251
+		',,', // &bdquo;
6252
+		'...', // &hellip;
6253
+		"'", // &lsquo;
6254
+		"'", // &rsquo;
6255
+		'"', // &ldquo;
6256
+		'"', // &rdquo;
6257 6257
 	);
6258 6258
 
6259 6259
 	if ($context['utf8'])
@@ -6614,7 +6614,7 @@  discard block
 block discarded – undo
6614 6614
 		// We don't want abbreviations like '+03' or '-11'.
6615 6615
 		$abbrs = array_filter(
6616 6616
 			$tzvalue['abbrs'],
6617
-			function ($abbr)
6617
+			function($abbr)
6618 6618
 			{
6619 6619
 				return !strspn($abbr, '+-');
6620 6620
 			}
@@ -7603,7 +7603,7 @@  discard block
 block discarded – undo
7603 7603
 			EXISTS (
7604 7604
 				SELECT bpv.id_board
7605 7605
 				FROM ' . $db_prefix . 'board_permissions_view AS bpv
7606
-				WHERE bpv.id_group IN ('. implode(',', $groups) .')
7606
+				WHERE bpv.id_group IN ('. implode(',', $groups) . ')
7607 7607
 					AND bpv.deny = 0
7608 7608
 					AND bpv.id_board = b.id_board
7609 7609
 			)';
@@ -7613,7 +7613,7 @@  discard block
 block discarded – undo
7613 7613
 			AND NOT EXISTS (
7614 7614
 				SELECT bpv.id_board
7615 7615
 				FROM ' . $db_prefix . 'board_permissions_view AS bpv
7616
-				WHERE bpv.id_group IN ( '. implode(',', $groups) .')
7616
+				WHERE bpv.id_group IN ( '. implode(',', $groups) . ')
7617 7617
 					AND bpv.deny = 1
7618 7618
 					AND bpv.id_board = b.id_board
7619 7619
 			)';
@@ -7930,8 +7930,8 @@  discard block
 block discarded – undo
7930 7930
 	$i = 0;
7931 7931
 	while (empty($done))
7932 7932
 	{
7933
-		if (strpos($format, '{'. --$i . '}') !== false)
7934
-			$replacements['{'. $i . '}'] = array_pop($list);
7933
+		if (strpos($format, '{' . --$i . '}') !== false)
7934
+			$replacements['{' . $i . '}'] = array_pop($list);
7935 7935
 		else
7936 7936
 			$done = true;
7937 7937
 	}
@@ -7941,8 +7941,8 @@  discard block
 block discarded – undo
7941 7941
 	$i = 0;
7942 7942
 	while (empty($done))
7943 7943
 	{
7944
-		if (strpos($format, '{'. ++$i . '}') !== false)
7945
-			$replacements['{'. $i . '}'] = array_shift($list);
7944
+		if (strpos($format, '{' . ++$i . '}') !== false)
7945
+			$replacements['{' . $i . '}'] = array_shift($list);
7946 7946
 		else
7947 7947
 			$done = true;
7948 7948
 	}
@@ -8120,7 +8120,7 @@  discard block
 block discarded – undo
8120 8120
 	if (empty($stringSubject))
8121 8121
 		return '';
8122 8122
 
8123
-	$translatable_tokens = preg_match_all('/{(.*?)}/' , $stringSubject, $matches);
8123
+	$translatable_tokens = preg_match_all('/{(.*?)}/', $stringSubject, $matches);
8124 8124
 	$toFind = array();
8125 8125
 	$replaceWith = array();
8126 8126
 
Please login to merge, or discard this patch.
Sources/Mentions.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -256,7 +256,7 @@
 block discarded – undo
256 256
 			return array();
257 257
 
258 258
 		// preparse code does a few things which might mess with our parsing
259
-		$body = htmlspecialchars_decode(preg_replace('~<br\s*/?'.'>~', "\n", str_replace('&nbsp;', ' ', $body)), ENT_QUOTES);
259
+		$body = htmlspecialchars_decode(preg_replace('~<br\s*/?' . '>~', "\n", str_replace('&nbsp;', ' ', $body)), ENT_QUOTES);
260 260
 
261 261
 		if (empty(self::$excluded_bbc_regex))
262 262
 			self::setExcludedBbcRegex();
Please login to merge, or discard this patch.
other/upgrade.php 2 patches
Spacing   +87 added lines, -87 removed lines patch added patch discarded remove patch
@@ -539,7 +539,7 @@  discard block
 block discarded – undo
539 539
 		$to = explode('/', $lang_dir);
540 540
 		$relPath = $to;
541 541
 
542
-		foreach($from as $depth => $dir)
542
+		foreach ($from as $depth => $dir)
543 543
 		{
544 544
 			if ($dir === $to[$depth])
545 545
 				array_shift($relPath);
@@ -3043,94 +3043,94 @@  discard block
 block discarded – undo
3043 3043
 		// Translation table for the character sets not native for MySQL.
3044 3044
 		$translation_tables = array(
3045 3045
 			'windows-1255' => array(
3046
-				'0x81' => '\'\'',		'0x8A' => '\'\'',		'0x8C' => '\'\'',
3047
-				'0x8D' => '\'\'',		'0x8E' => '\'\'',		'0x8F' => '\'\'',
3048
-				'0x90' => '\'\'',		'0x9A' => '\'\'',		'0x9C' => '\'\'',
3049
-				'0x9D' => '\'\'',		'0x9E' => '\'\'',		'0x9F' => '\'\'',
3050
-				'0xCA' => '\'\'',		'0xD9' => '\'\'',		'0xDA' => '\'\'',
3051
-				'0xDB' => '\'\'',		'0xDC' => '\'\'',		'0xDD' => '\'\'',
3052
-				'0xDE' => '\'\'',		'0xDF' => '\'\'',		'0xFB' => '0xD792',
3053
-				'0xFC' => '0xE282AC',		'0xFF' => '0xD6B2',		'0xC2' => '0xFF',
3054
-				'0x80' => '0xFC',		'0xE2' => '0xFB',		'0xA0' => '0xC2A0',
3055
-				'0xA1' => '0xC2A1',		'0xA2' => '0xC2A2',		'0xA3' => '0xC2A3',
3056
-				'0xA5' => '0xC2A5',		'0xA6' => '0xC2A6',		'0xA7' => '0xC2A7',
3057
-				'0xA8' => '0xC2A8',		'0xA9' => '0xC2A9',		'0xAB' => '0xC2AB',
3058
-				'0xAC' => '0xC2AC',		'0xAD' => '0xC2AD',		'0xAE' => '0xC2AE',
3059
-				'0xAF' => '0xC2AF',		'0xB0' => '0xC2B0',		'0xB1' => '0xC2B1',
3060
-				'0xB2' => '0xC2B2',		'0xB3' => '0xC2B3',		'0xB4' => '0xC2B4',
3061
-				'0xB5' => '0xC2B5',		'0xB6' => '0xC2B6',		'0xB7' => '0xC2B7',
3062
-				'0xB8' => '0xC2B8',		'0xB9' => '0xC2B9',		'0xBB' => '0xC2BB',
3063
-				'0xBC' => '0xC2BC',		'0xBD' => '0xC2BD',		'0xBE' => '0xC2BE',
3064
-				'0xBF' => '0xC2BF',		'0xD7' => '0xD7B3',		'0xD1' => '0xD781',
3065
-				'0xD4' => '0xD7B0',		'0xD5' => '0xD7B1',		'0xD6' => '0xD7B2',
3066
-				'0xE0' => '0xD790',		'0xEA' => '0xD79A',		'0xEC' => '0xD79C',
3067
-				'0xED' => '0xD79D',		'0xEE' => '0xD79E',		'0xEF' => '0xD79F',
3068
-				'0xF0' => '0xD7A0',		'0xF1' => '0xD7A1',		'0xF2' => '0xD7A2',
3069
-				'0xF3' => '0xD7A3',		'0xF5' => '0xD7A5',		'0xF6' => '0xD7A6',
3070
-				'0xF7' => '0xD7A7',		'0xF8' => '0xD7A8',		'0xF9' => '0xD7A9',
3071
-				'0x82' => '0xE2809A',	'0x84' => '0xE2809E',	'0x85' => '0xE280A6',
3072
-				'0x86' => '0xE280A0',	'0x87' => '0xE280A1',	'0x89' => '0xE280B0',
3073
-				'0x8B' => '0xE280B9',	'0x93' => '0xE2809C',	'0x94' => '0xE2809D',
3074
-				'0x95' => '0xE280A2',	'0x97' => '0xE28094',	'0x99' => '0xE284A2',
3075
-				'0xC0' => '0xD6B0',		'0xC1' => '0xD6B1',		'0xC3' => '0xD6B3',
3076
-				'0xC4' => '0xD6B4',		'0xC5' => '0xD6B5',		'0xC6' => '0xD6B6',
3077
-				'0xC7' => '0xD6B7',		'0xC8' => '0xD6B8',		'0xC9' => '0xD6B9',
3078
-				'0xCB' => '0xD6BB',		'0xCC' => '0xD6BC',		'0xCD' => '0xD6BD',
3079
-				'0xCE' => '0xD6BE',		'0xCF' => '0xD6BF',		'0xD0' => '0xD780',
3080
-				'0xD2' => '0xD782',		'0xE3' => '0xD793',		'0xE4' => '0xD794',
3081
-				'0xE5' => '0xD795',		'0xE7' => '0xD797',		'0xE9' => '0xD799',
3082
-				'0xFD' => '0xE2808E',	'0xFE' => '0xE2808F',	'0x92' => '0xE28099',
3083
-				'0x83' => '0xC692',		'0xD3' => '0xD783',		'0x88' => '0xCB86',
3084
-				'0x98' => '0xCB9C',		'0x91' => '0xE28098',	'0x96' => '0xE28093',
3085
-				'0xBA' => '0xC3B7',		'0x9B' => '0xE280BA',	'0xAA' => '0xC397',
3086
-				'0xA4' => '0xE282AA',	'0xE1' => '0xD791',		'0xE6' => '0xD796',
3087
-				'0xE8' => '0xD798',		'0xEB' => '0xD79B',		'0xF4' => '0xD7A4',
3046
+				'0x81' => '\'\'', '0x8A' => '\'\'', '0x8C' => '\'\'',
3047
+				'0x8D' => '\'\'', '0x8E' => '\'\'', '0x8F' => '\'\'',
3048
+				'0x90' => '\'\'', '0x9A' => '\'\'', '0x9C' => '\'\'',
3049
+				'0x9D' => '\'\'', '0x9E' => '\'\'', '0x9F' => '\'\'',
3050
+				'0xCA' => '\'\'', '0xD9' => '\'\'', '0xDA' => '\'\'',
3051
+				'0xDB' => '\'\'', '0xDC' => '\'\'', '0xDD' => '\'\'',
3052
+				'0xDE' => '\'\'', '0xDF' => '\'\'', '0xFB' => '0xD792',
3053
+				'0xFC' => '0xE282AC', '0xFF' => '0xD6B2', '0xC2' => '0xFF',
3054
+				'0x80' => '0xFC', '0xE2' => '0xFB', '0xA0' => '0xC2A0',
3055
+				'0xA1' => '0xC2A1', '0xA2' => '0xC2A2', '0xA3' => '0xC2A3',
3056
+				'0xA5' => '0xC2A5', '0xA6' => '0xC2A6', '0xA7' => '0xC2A7',
3057
+				'0xA8' => '0xC2A8', '0xA9' => '0xC2A9', '0xAB' => '0xC2AB',
3058
+				'0xAC' => '0xC2AC', '0xAD' => '0xC2AD', '0xAE' => '0xC2AE',
3059
+				'0xAF' => '0xC2AF', '0xB0' => '0xC2B0', '0xB1' => '0xC2B1',
3060
+				'0xB2' => '0xC2B2', '0xB3' => '0xC2B3', '0xB4' => '0xC2B4',
3061
+				'0xB5' => '0xC2B5', '0xB6' => '0xC2B6', '0xB7' => '0xC2B7',
3062
+				'0xB8' => '0xC2B8', '0xB9' => '0xC2B9', '0xBB' => '0xC2BB',
3063
+				'0xBC' => '0xC2BC', '0xBD' => '0xC2BD', '0xBE' => '0xC2BE',
3064
+				'0xBF' => '0xC2BF', '0xD7' => '0xD7B3', '0xD1' => '0xD781',
3065
+				'0xD4' => '0xD7B0', '0xD5' => '0xD7B1', '0xD6' => '0xD7B2',
3066
+				'0xE0' => '0xD790', '0xEA' => '0xD79A', '0xEC' => '0xD79C',
3067
+				'0xED' => '0xD79D', '0xEE' => '0xD79E', '0xEF' => '0xD79F',
3068
+				'0xF0' => '0xD7A0', '0xF1' => '0xD7A1', '0xF2' => '0xD7A2',
3069
+				'0xF3' => '0xD7A3', '0xF5' => '0xD7A5', '0xF6' => '0xD7A6',
3070
+				'0xF7' => '0xD7A7', '0xF8' => '0xD7A8', '0xF9' => '0xD7A9',
3071
+				'0x82' => '0xE2809A', '0x84' => '0xE2809E', '0x85' => '0xE280A6',
3072
+				'0x86' => '0xE280A0', '0x87' => '0xE280A1', '0x89' => '0xE280B0',
3073
+				'0x8B' => '0xE280B9', '0x93' => '0xE2809C', '0x94' => '0xE2809D',
3074
+				'0x95' => '0xE280A2', '0x97' => '0xE28094', '0x99' => '0xE284A2',
3075
+				'0xC0' => '0xD6B0', '0xC1' => '0xD6B1', '0xC3' => '0xD6B3',
3076
+				'0xC4' => '0xD6B4', '0xC5' => '0xD6B5', '0xC6' => '0xD6B6',
3077
+				'0xC7' => '0xD6B7', '0xC8' => '0xD6B8', '0xC9' => '0xD6B9',
3078
+				'0xCB' => '0xD6BB', '0xCC' => '0xD6BC', '0xCD' => '0xD6BD',
3079
+				'0xCE' => '0xD6BE', '0xCF' => '0xD6BF', '0xD0' => '0xD780',
3080
+				'0xD2' => '0xD782', '0xE3' => '0xD793', '0xE4' => '0xD794',
3081
+				'0xE5' => '0xD795', '0xE7' => '0xD797', '0xE9' => '0xD799',
3082
+				'0xFD' => '0xE2808E', '0xFE' => '0xE2808F', '0x92' => '0xE28099',
3083
+				'0x83' => '0xC692', '0xD3' => '0xD783', '0x88' => '0xCB86',
3084
+				'0x98' => '0xCB9C', '0x91' => '0xE28098', '0x96' => '0xE28093',
3085
+				'0xBA' => '0xC3B7', '0x9B' => '0xE280BA', '0xAA' => '0xC397',
3086
+				'0xA4' => '0xE282AA', '0xE1' => '0xD791', '0xE6' => '0xD796',
3087
+				'0xE8' => '0xD798', '0xEB' => '0xD79B', '0xF4' => '0xD7A4',
3088 3088
 				'0xFA' => '0xD7AA',
3089 3089
 			),
3090 3090
 			'windows-1253' => array(
3091
-				'0x81' => '\'\'',			'0x88' => '\'\'',			'0x8A' => '\'\'',
3092
-				'0x8C' => '\'\'',			'0x8D' => '\'\'',			'0x8E' => '\'\'',
3093
-				'0x8F' => '\'\'',			'0x90' => '\'\'',			'0x98' => '\'\'',
3094
-				'0x9A' => '\'\'',			'0x9C' => '\'\'',			'0x9D' => '\'\'',
3095
-				'0x9E' => '\'\'',			'0x9F' => '\'\'',			'0xAA' => '\'\'',
3096
-				'0xD2' => '0xE282AC',			'0xFF' => '0xCE92',			'0xCE' => '0xCE9E',
3097
-				'0xB8' => '0xCE88',		'0xBA' => '0xCE8A',		'0xBC' => '0xCE8C',
3098
-				'0xBE' => '0xCE8E',		'0xBF' => '0xCE8F',		'0xC0' => '0xCE90',
3099
-				'0xC8' => '0xCE98',		'0xCA' => '0xCE9A',		'0xCC' => '0xCE9C',
3100
-				'0xCD' => '0xCE9D',		'0xCF' => '0xCE9F',		'0xDA' => '0xCEAA',
3101
-				'0xE8' => '0xCEB8',		'0xEA' => '0xCEBA',		'0xEC' => '0xCEBC',
3102
-				'0xEE' => '0xCEBE',		'0xEF' => '0xCEBF',		'0xC2' => '0xFF',
3103
-				'0xBD' => '0xC2BD',		'0xED' => '0xCEBD',		'0xB2' => '0xC2B2',
3104
-				'0xA0' => '0xC2A0',		'0xA3' => '0xC2A3',		'0xA4' => '0xC2A4',
3105
-				'0xA5' => '0xC2A5',		'0xA6' => '0xC2A6',		'0xA7' => '0xC2A7',
3106
-				'0xA8' => '0xC2A8',		'0xA9' => '0xC2A9',		'0xAB' => '0xC2AB',
3107
-				'0xAC' => '0xC2AC',		'0xAD' => '0xC2AD',		'0xAE' => '0xC2AE',
3108
-				'0xB0' => '0xC2B0',		'0xB1' => '0xC2B1',		'0xB3' => '0xC2B3',
3109
-				'0xB5' => '0xC2B5',		'0xB6' => '0xC2B6',		'0xB7' => '0xC2B7',
3110
-				'0xBB' => '0xC2BB',		'0xE2' => '0xCEB2',		'0x80' => '0xD2',
3111
-				'0x82' => '0xE2809A',	'0x84' => '0xE2809E',	'0x85' => '0xE280A6',
3112
-				'0x86' => '0xE280A0',	'0xA1' => '0xCE85',		'0xA2' => '0xCE86',
3113
-				'0x87' => '0xE280A1',	'0x89' => '0xE280B0',	'0xB9' => '0xCE89',
3114
-				'0x8B' => '0xE280B9',	'0x91' => '0xE28098',	'0x99' => '0xE284A2',
3115
-				'0x92' => '0xE28099',	'0x93' => '0xE2809C',	'0x94' => '0xE2809D',
3116
-				'0x95' => '0xE280A2',	'0x96' => '0xE28093',	'0x97' => '0xE28094',
3117
-				'0x9B' => '0xE280BA',	'0xAF' => '0xE28095',	'0xB4' => '0xCE84',
3118
-				'0xC1' => '0xCE91',		'0xC3' => '0xCE93',		'0xC4' => '0xCE94',
3119
-				'0xC5' => '0xCE95',		'0xC6' => '0xCE96',		'0x83' => '0xC692',
3120
-				'0xC7' => '0xCE97',		'0xC9' => '0xCE99',		'0xCB' => '0xCE9B',
3121
-				'0xD0' => '0xCEA0',		'0xD1' => '0xCEA1',		'0xD3' => '0xCEA3',
3122
-				'0xD4' => '0xCEA4',		'0xD5' => '0xCEA5',		'0xD6' => '0xCEA6',
3123
-				'0xD7' => '0xCEA7',		'0xD8' => '0xCEA8',		'0xD9' => '0xCEA9',
3124
-				'0xDB' => '0xCEAB',		'0xDC' => '0xCEAC',		'0xDD' => '0xCEAD',
3125
-				'0xDE' => '0xCEAE',		'0xDF' => '0xCEAF',		'0xE0' => '0xCEB0',
3126
-				'0xE1' => '0xCEB1',		'0xE3' => '0xCEB3',		'0xE4' => '0xCEB4',
3127
-				'0xE5' => '0xCEB5',		'0xE6' => '0xCEB6',		'0xE7' => '0xCEB7',
3128
-				'0xE9' => '0xCEB9',		'0xEB' => '0xCEBB',		'0xF0' => '0xCF80',
3129
-				'0xF1' => '0xCF81',		'0xF2' => '0xCF82',		'0xF3' => '0xCF83',
3130
-				'0xF4' => '0xCF84',		'0xF5' => '0xCF85',		'0xF6' => '0xCF86',
3131
-				'0xF7' => '0xCF87',		'0xF8' => '0xCF88',		'0xF9' => '0xCF89',
3132
-				'0xFA' => '0xCF8A',		'0xFB' => '0xCF8B',		'0xFC' => '0xCF8C',
3133
-				'0xFD' => '0xCF8D',		'0xFE' => '0xCF8E',
3091
+				'0x81' => '\'\'', '0x88' => '\'\'', '0x8A' => '\'\'',
3092
+				'0x8C' => '\'\'', '0x8D' => '\'\'', '0x8E' => '\'\'',
3093
+				'0x8F' => '\'\'', '0x90' => '\'\'', '0x98' => '\'\'',
3094
+				'0x9A' => '\'\'', '0x9C' => '\'\'', '0x9D' => '\'\'',
3095
+				'0x9E' => '\'\'', '0x9F' => '\'\'', '0xAA' => '\'\'',
3096
+				'0xD2' => '0xE282AC', '0xFF' => '0xCE92', '0xCE' => '0xCE9E',
3097
+				'0xB8' => '0xCE88', '0xBA' => '0xCE8A', '0xBC' => '0xCE8C',
3098
+				'0xBE' => '0xCE8E', '0xBF' => '0xCE8F', '0xC0' => '0xCE90',
3099
+				'0xC8' => '0xCE98', '0xCA' => '0xCE9A', '0xCC' => '0xCE9C',
3100
+				'0xCD' => '0xCE9D', '0xCF' => '0xCE9F', '0xDA' => '0xCEAA',
3101
+				'0xE8' => '0xCEB8', '0xEA' => '0xCEBA', '0xEC' => '0xCEBC',
3102
+				'0xEE' => '0xCEBE', '0xEF' => '0xCEBF', '0xC2' => '0xFF',
3103
+				'0xBD' => '0xC2BD', '0xED' => '0xCEBD', '0xB2' => '0xC2B2',
3104
+				'0xA0' => '0xC2A0', '0xA3' => '0xC2A3', '0xA4' => '0xC2A4',
3105
+				'0xA5' => '0xC2A5', '0xA6' => '0xC2A6', '0xA7' => '0xC2A7',
3106
+				'0xA8' => '0xC2A8', '0xA9' => '0xC2A9', '0xAB' => '0xC2AB',
3107
+				'0xAC' => '0xC2AC', '0xAD' => '0xC2AD', '0xAE' => '0xC2AE',
3108
+				'0xB0' => '0xC2B0', '0xB1' => '0xC2B1', '0xB3' => '0xC2B3',
3109
+				'0xB5' => '0xC2B5', '0xB6' => '0xC2B6', '0xB7' => '0xC2B7',
3110
+				'0xBB' => '0xC2BB', '0xE2' => '0xCEB2', '0x80' => '0xD2',
3111
+				'0x82' => '0xE2809A', '0x84' => '0xE2809E', '0x85' => '0xE280A6',
3112
+				'0x86' => '0xE280A0', '0xA1' => '0xCE85', '0xA2' => '0xCE86',
3113
+				'0x87' => '0xE280A1', '0x89' => '0xE280B0', '0xB9' => '0xCE89',
3114
+				'0x8B' => '0xE280B9', '0x91' => '0xE28098', '0x99' => '0xE284A2',
3115
+				'0x92' => '0xE28099', '0x93' => '0xE2809C', '0x94' => '0xE2809D',
3116
+				'0x95' => '0xE280A2', '0x96' => '0xE28093', '0x97' => '0xE28094',
3117
+				'0x9B' => '0xE280BA', '0xAF' => '0xE28095', '0xB4' => '0xCE84',
3118
+				'0xC1' => '0xCE91', '0xC3' => '0xCE93', '0xC4' => '0xCE94',
3119
+				'0xC5' => '0xCE95', '0xC6' => '0xCE96', '0x83' => '0xC692',
3120
+				'0xC7' => '0xCE97', '0xC9' => '0xCE99', '0xCB' => '0xCE9B',
3121
+				'0xD0' => '0xCEA0', '0xD1' => '0xCEA1', '0xD3' => '0xCEA3',
3122
+				'0xD4' => '0xCEA4', '0xD5' => '0xCEA5', '0xD6' => '0xCEA6',
3123
+				'0xD7' => '0xCEA7', '0xD8' => '0xCEA8', '0xD9' => '0xCEA9',
3124
+				'0xDB' => '0xCEAB', '0xDC' => '0xCEAC', '0xDD' => '0xCEAD',
3125
+				'0xDE' => '0xCEAE', '0xDF' => '0xCEAF', '0xE0' => '0xCEB0',
3126
+				'0xE1' => '0xCEB1', '0xE3' => '0xCEB3', '0xE4' => '0xCEB4',
3127
+				'0xE5' => '0xCEB5', '0xE6' => '0xCEB6', '0xE7' => '0xCEB7',
3128
+				'0xE9' => '0xCEB9', '0xEB' => '0xCEBB', '0xF0' => '0xCF80',
3129
+				'0xF1' => '0xCF81', '0xF2' => '0xCF82', '0xF3' => '0xCF83',
3130
+				'0xF4' => '0xCF84', '0xF5' => '0xCF85', '0xF6' => '0xCF86',
3131
+				'0xF7' => '0xCF87', '0xF8' => '0xCF88', '0xF9' => '0xCF89',
3132
+				'0xFA' => '0xCF8A', '0xFB' => '0xCF8B', '0xFC' => '0xCF8C',
3133
+				'0xFD' => '0xCF8D', '0xFE' => '0xCF8E',
3134 3134
 			),
3135 3135
 		);
3136 3136
 
@@ -3390,7 +3390,7 @@  discard block
 block discarded – undo
3390 3390
 			// This bit fixes incorrect string lengths, which can happen if the character encoding was changed (e.g. conversion to UTF-8)
3391 3391
 			$new_string = preg_replace_callback(
3392 3392
 				'~\bs:(\d+):"(.*?)";(?=$|[bidsaO]:|[{}}]|N;)~s',
3393
-				function ($matches)
3393
+				function($matches)
3394 3394
 				{
3395 3395
 					return 's:' . strlen($matches[2]) . ':"' . $matches[2] . '";';
3396 3396
 				},
Please login to merge, or discard this 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/Subs-Compat.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -222,7 +222,7 @@
 block discarded – undo
222 222
 			if (!function_exists('mb_encode_numericentity'))
223 223
 				return false;
224 224
 
225
-			$entity = mb_encode_numericentity($string, array(0x0,0x10FFFF,0x0,0xFFFFFF), $encoding);
225
+			$entity = mb_encode_numericentity($string, array(0x0, 0x10FFFF, 0x0, 0xFFFFFF), $encoding);
226 226
 
227 227
 			if (strpos($entity, '&#') !== 0)
228 228
 				return false;
Please login to merge, or discard this patch.
Sources/Search.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1107,7 +1107,7 @@
 block discarded – undo
1107 1107
 						'left_join' => array(),
1108 1108
 						'where' => array(
1109 1109
 							't.id_redirect_topic = {int:not_redirected}',
1110
-						    't.redirect_expires = {int:never_expires}',
1110
+							't.redirect_expires = {int:never_expires}',
1111 1111
 						),
1112 1112
 					);
1113 1113
 
Please login to merge, or discard this patch.