Completed
Pull Request — release-2.1 (#5735)
by Mathias
04:49
created
Sources/Subs.php 1 patch
Spacing   +29 added lines, -29 removed lines patch added patch discarded remove patch
@@ -395,7 +395,7 @@  discard block
 block discarded – undo
395 395
 			{
396 396
 				$val = 'CASE ';
397 397
 				foreach ($members as $k => $v)
398
-					$val .= 'WHEN id_member = ' . $v . ' THEN '. alert_count($v, true) . ' ';
398
+					$val .= 'WHEN id_member = ' . $v . ' THEN ' . alert_count($v, true) . ' ';
399 399
 				$val = $val . ' END';
400 400
 				$type = 'raw';
401 401
 			}
@@ -1055,11 +1055,11 @@  discard block
 block discarded – undo
1055 1055
 			// Anything that isn't a specification, punctuation mark, or whitespace.
1056 1056
 			'~(?<!%)\p{L}|[^\p{L}\p{P}\s]~u',
1057 1057
 			// A series of punctuation marks (except %), possibly separated by whitespace.
1058
-			'~([^%\P{P}])(\s*)(?'.'>(\1|[^%\P{Po}])\s*(?!$))*~u',
1058
+			'~([^%\P{P}])(\s*)(?' . '>(\1|[^%\P{Po}])\s*(?!$))*~u',
1059 1059
 			// Unwanted trailing punctuation and whitespace.
1060
-			'~(?'.'>([\p{Pd}\p{Ps}\p{Pi}\p{Pc}]|[^%\P{Po}])\s*)*$~u',
1060
+			'~(?' . '>([\p{Pd}\p{Ps}\p{Pi}\p{Pc}]|[^%\P{Po}])\s*)*$~u',
1061 1061
 			// Unwanted opening punctuation and whitespace.
1062
-			'~^\s*(?'.'>([\p{Pd}\p{Pe}\p{Pf}\p{Pc}]|[^%\P{Po}])\s*)*~u',
1062
+			'~^\s*(?' . '>([\p{Pd}\p{Pe}\p{Pf}\p{Pc}]|[^%\P{Po}])\s*)*~u',
1063 1063
 		),
1064 1064
 		array(
1065 1065
 			'',
@@ -1599,7 +1599,7 @@  discard block
 block discarded – undo
1599 1599
 				'type' => 'unparsed_commas_content',
1600 1600
 				'test' => '\d+,\d+\]',
1601 1601
 				'content' => '<a href="$1" target="_blank" rel="noopener">$1</a>',
1602
-				'validate' => function (&$tag, &$data, $disabled)
1602
+				'validate' => function(&$tag, &$data, $disabled)
1603 1603
 				{
1604 1604
 					$scheme = parse_url($data[0], PHP_URL_SCHEME);
1605 1605
 					if (empty($scheme))
@@ -2159,7 +2159,7 @@  discard block
 block discarded – undo
2159 2159
 		$codes[] = array(
2160 2160
 			'tag' => 'cowsay',
2161 2161
 			'parameters' => array(
2162
-				'e' => array('optional' => true, 'quoted' => true, 'match' => '(.*?)', 'default' => 'oo', 'validate' => function ($eyes) use ($smcFunc)
2162
+				'e' => array('optional' => true, 'quoted' => true, 'match' => '(.*?)', 'default' => 'oo', 'validate' => function($eyes) use ($smcFunc)
2163 2163
 					{
2164 2164
 						static $css_added;
2165 2165
 
@@ -2176,7 +2176,7 @@  discard block
 block discarded – undo
2176 2176
 						return $smcFunc['substr']($eyes . 'oo', 0, 2);
2177 2177
 					},
2178 2178
 				),
2179
-				't' => array('optional' => true, 'quoted' => true, 'match' => '(.*?)', 'default' => '  ', 'validate' => function ($tongue) use ($smcFunc)
2179
+				't' => array('optional' => true, 'quoted' => true, 'match' => '(.*?)', 'default' => '  ', 'validate' => function($tongue) use ($smcFunc)
2180 2180
 					{
2181 2181
 						return $smcFunc['substr']($tongue . '  ', 0, 2);
2182 2182
 					},
@@ -4140,7 +4140,7 @@  discard block
 block discarded – undo
4140 4140
 	$toMinify = array();
4141 4141
 	$normal = array();
4142 4142
 
4143
-	usort($context['css_files'], function ($a, $b)
4143
+	usort($context['css_files'], function($a, $b)
4144 4144
 	{
4145 4145
 		return $a['options']['order_pos'] < $b['options']['order_pos'] ? -1 : ($a['options']['order_pos'] > $b['options']['order_pos'] ? 1 : 0);
4146 4146
 	});
@@ -5605,13 +5605,13 @@  discard block
 block discarded – undo
5605 5605
 
5606 5606
 	// UTF-8 occurences of MS special characters
5607 5607
 	$findchars_utf8 = array(
5608
-		"\xe2\x80\x9a",	// single low-9 quotation mark
5609
-		"\xe2\x80\x9e",	// double low-9 quotation mark
5610
-		"\xe2\x80\xa6",	// horizontal ellipsis
5611
-		"\xe2\x80\x98",	// left single curly quote
5612
-		"\xe2\x80\x99",	// right single curly quote
5613
-		"\xe2\x80\x9c",	// left double curly quote
5614
-		"\xe2\x80\x9d",	// right double curly quote
5608
+		"\xe2\x80\x9a", // single low-9 quotation mark
5609
+		"\xe2\x80\x9e", // double low-9 quotation mark
5610
+		"\xe2\x80\xa6", // horizontal ellipsis
5611
+		"\xe2\x80\x98", // left single curly quote
5612
+		"\xe2\x80\x99", // right single curly quote
5613
+		"\xe2\x80\x9c", // left double curly quote
5614
+		"\xe2\x80\x9d", // right double curly quote
5615 5615
 	);
5616 5616
 
5617 5617
 	// windows 1252 / iso equivalents
@@ -5627,13 +5627,13 @@  discard block
 block discarded – undo
5627 5627
 
5628 5628
 	// safe replacements
5629 5629
 	$replacechars = array(
5630
-		',',	// &sbquo;
5631
-		',,',	// &bdquo;
5632
-		'...',	// &hellip;
5633
-		"'",	// &lsquo;
5634
-		"'",	// &rsquo;
5635
-		'"',	// &ldquo;
5636
-		'"',	// &rdquo;
5630
+		',', // &sbquo;
5631
+		',,', // &bdquo;
5632
+		'...', // &hellip;
5633
+		"'", // &lsquo;
5634
+		"'", // &rsquo;
5635
+		'"', // &ldquo;
5636
+		'"', // &rdquo;
5637 5637
 	);
5638 5638
 
5639 5639
 	if ($context['utf8'])
@@ -6522,7 +6522,7 @@  discard block
 block discarded – undo
6522 6522
 	global $smcFunc;
6523 6523
 	static $cache_buids = array();
6524 6524
 	
6525
-	$cache_key = md5(json_encode($strings)) .'d=' . $delim . 'r=' . $returnArray;
6525
+	$cache_key = md5(json_encode($strings)) . 'd=' . $delim . 'r=' . $returnArray;
6526 6526
 	
6527 6527
 	if (isset($cache_buids[$cache_key]))
6528 6528
 		return $cache_buids[$cache_key];
@@ -6807,7 +6807,7 @@  discard block
 block discarded – undo
6807 6807
 			EXISTS (
6808 6808
 				SELECT bpv.id_board
6809 6809
 				FROM ' . $db_prefix . 'board_permissions_view AS bpv
6810
-				WHERE bpv.id_group IN ('. implode(',', $groups) .')
6810
+				WHERE bpv.id_group IN ('. implode(',', $groups) . ')
6811 6811
 					AND bpv.deny = 0
6812 6812
 					AND bpv.id_board = b.id_board
6813 6813
 			)';
@@ -6817,7 +6817,7 @@  discard block
 block discarded – undo
6817 6817
 			AND NOT EXISTS (
6818 6818
 				SELECT bpv.id_board
6819 6819
 				FROM ' . $db_prefix . 'board_permissions_view AS bpv
6820
-				WHERE bpv.id_group IN ( '. implode(',', $groups) .')
6820
+				WHERE bpv.id_group IN ( '. implode(',', $groups) . ')
6821 6821
 					AND bpv.deny = 1
6822 6822
 					AND bpv.id_board = b.id_board
6823 6823
 			)';
@@ -7088,8 +7088,8 @@  discard block
 block discarded – undo
7088 7088
 	$i = 0;
7089 7089
 	while (empty($done))
7090 7090
 	{
7091
-		if (strpos($format, '{'. --$i . '}') !== false)
7092
-			$replacements['{'. $i . '}'] = array_pop($list);
7091
+		if (strpos($format, '{' . --$i . '}') !== false)
7092
+			$replacements['{' . $i . '}'] = array_pop($list);
7093 7093
 		else
7094 7094
 			$done = true;
7095 7095
 	}
@@ -7099,8 +7099,8 @@  discard block
 block discarded – undo
7099 7099
 	$i = 0;
7100 7100
 	while (empty($done))
7101 7101
 	{
7102
-		if (strpos($format, '{'. ++$i . '}') !== false)
7103
-			$replacements['{'. $i . '}'] = array_shift($list);
7102
+		if (strpos($format, '{' . ++$i . '}') !== false)
7103
+			$replacements['{' . $i . '}'] = array_shift($list);
7104 7104
 		else
7105 7105
 			$done = true;
7106 7106
 	}
Please login to merge, or discard this patch.