Completed
Push — release-2.1 ( b22db7...d22fc2 )
by Jon
39s queued 18s
created
Sources/Subs.php 1 patch
Spacing   +32 added lines, -32 removed lines patch added patch discarded remove patch
@@ -391,7 +391,7 @@  discard block
 block discarded – undo
391 391
 			{
392 392
 				$val = 'CASE ';
393 393
 				foreach ($members as $k => $v)
394
-					$val .= 'WHEN id_member = ' . $v . ' THEN '. alert_count($v, true) . ' ';
394
+					$val .= 'WHEN id_member = ' . $v . ' THEN ' . alert_count($v, true) . ' ';
395 395
 				$val = $val . ' END';
396 396
 				$type = 'raw';
397 397
 			}
@@ -979,11 +979,11 @@  discard block
 block discarded – undo
979 979
 			// Anything that isn't a specification, punctuation mark, or whitespace.
980 980
 			'~(?<!%)\p{L}|[^\p{L}\p{P}\s]~u',
981 981
 			// A series of punctuation marks (except %), possibly separated by whitespace.
982
-			'~([^%\P{P}])(\s*)(?'.'>(\1|[^%\P{Po}])\s*(?!$))*~u',
982
+			'~([^%\P{P}])(\s*)(?' . '>(\1|[^%\P{Po}])\s*(?!$))*~u',
983 983
 			// Unwanted trailing punctuation and whitespace.
984
-			'~(?'.'>([\p{Pd}\p{Ps}\p{Pi}\p{Pc}]|[^%\P{Po}])\s*)*$~u',
984
+			'~(?' . '>([\p{Pd}\p{Ps}\p{Pi}\p{Pc}]|[^%\P{Po}])\s*)*$~u',
985 985
 			// Unwanted opening punctuation and whitespace.
986
-			'~^\s*(?'.'>([\p{Pd}\p{Pe}\p{Pf}\p{Pc}]|[^%\P{Po}])\s*)*~u',
986
+			'~^\s*(?' . '>([\p{Pd}\p{Pe}\p{Pf}\p{Pc}]|[^%\P{Po}])\s*)*~u',
987 987
 		),
988 988
 		array(
989 989
 			'',
@@ -1520,7 +1520,7 @@  discard block
 block discarded – undo
1520 1520
 				'type' => 'unparsed_commas_content',
1521 1521
 				'test' => '\d+,\d+\]',
1522 1522
 				'content' => '<a href="$1" target="_blank" rel="noopener">$1</a>',
1523
-				'validate' => function (&$tag, &$data, $disabled)
1523
+				'validate' => function(&$tag, &$data, $disabled)
1524 1524
 				{
1525 1525
 					$scheme = parse_url($data[0], PHP_URL_SCHEME);
1526 1526
 					if (empty($scheme))
@@ -2082,7 +2082,7 @@  discard block
 block discarded – undo
2082 2082
 		$codes[] = array(
2083 2083
 			'tag' => 'cowsay',
2084 2084
 			'parameters' => array(
2085
-				'e' => array('optional' => true, 'quoted' => true, 'match' => '(.*?)', 'default' => 'oo', 'validate' => function ($eyes) use ($smcFunc)
2085
+				'e' => array('optional' => true, 'quoted' => true, 'match' => '(.*?)', 'default' => 'oo', 'validate' => function($eyes) use ($smcFunc)
2086 2086
 					{
2087 2087
 						static $css_added;
2088 2088
 
@@ -2099,7 +2099,7 @@  discard block
 block discarded – undo
2099 2099
 						return $smcFunc['substr']($eyes . 'oo', 0, 2);
2100 2100
 					},
2101 2101
 				),
2102
-				't' => array('optional' => true, 'quoted' => true, 'match' => '(.*?)', 'default' => '  ', 'validate' => function ($tongue) use ($smcFunc)
2102
+				't' => array('optional' => true, 'quoted' => true, 'match' => '(.*?)', 'default' => '  ', 'validate' => function($tongue) use ($smcFunc)
2103 2103
 					{
2104 2104
 						return $smcFunc['substr']($tongue . '  ', 0, 2);
2105 2105
 					},
@@ -4070,7 +4070,7 @@  discard block
 block discarded – undo
4070 4070
 	$toMinify = array();
4071 4071
 	$normal = array();
4072 4072
 
4073
-	usort($context['css_files'], function ($a, $b)
4073
+	usort($context['css_files'], function($a, $b)
4074 4074
 	{
4075 4075
 		return $a['options']['order_pos'] < $b['options']['order_pos'] ? -1 : ($a['options']['order_pos'] > $b['options']['order_pos'] ? 1 : 0);
4076 4076
 	});
@@ -5519,15 +5519,15 @@  discard block
 block discarded – undo
5519 5519
 
5520 5520
 	// UTF-8 occurences of MS special characters
5521 5521
 	$findchars_utf8 = array(
5522
-		"\xe2\x80\x9a",	// single low-9 quotation mark
5523
-		"\xe2\x80\x9e",	// double low-9 quotation mark
5524
-		"\xe2\x80\xa6",	// horizontal ellipsis
5525
-		"\xe2\x80\x98",	// left single curly quote
5526
-		"\xe2\x80\x99",	// right single curly quote
5527
-		"\xe2\x80\x9c",	// left double curly quote
5528
-		"\xe2\x80\x9d",	// right double curly quote
5529
-		"\xe2\x80\x93",	// en dash
5530
-		"\xe2\x80\x94",	// em dash
5522
+		"\xe2\x80\x9a", // single low-9 quotation mark
5523
+		"\xe2\x80\x9e", // double low-9 quotation mark
5524
+		"\xe2\x80\xa6", // horizontal ellipsis
5525
+		"\xe2\x80\x98", // left single curly quote
5526
+		"\xe2\x80\x99", // right single curly quote
5527
+		"\xe2\x80\x9c", // left double curly quote
5528
+		"\xe2\x80\x9d", // right double curly quote
5529
+		"\xe2\x80\x93", // en dash
5530
+		"\xe2\x80\x94", // em dash
5531 5531
 	);
5532 5532
 
5533 5533
 	// windows 1252 / iso equivalents
@@ -5545,15 +5545,15 @@  discard block
 block discarded – undo
5545 5545
 
5546 5546
 	// safe replacements
5547 5547
 	$replacechars = array(
5548
-		',',	// &sbquo;
5549
-		',,',	// &bdquo;
5550
-		'...',	// &hellip;
5551
-		"'",	// &lsquo;
5552
-		"'",	// &rsquo;
5553
-		'"',	// &ldquo;
5554
-		'"',	// &rdquo;
5555
-		'-',	// &ndash;
5556
-		'--',	// &mdash;
5548
+		',', // &sbquo;
5549
+		',,', // &bdquo;
5550
+		'...', // &hellip;
5551
+		"'", // &lsquo;
5552
+		"'", // &rsquo;
5553
+		'"', // &ldquo;
5554
+		'"', // &rdquo;
5555
+		'-', // &ndash;
5556
+		'--', // &mdash;
5557 5557
 	);
5558 5558
 
5559 5559
 	if ($context['utf8'])
@@ -6683,7 +6683,7 @@  discard block
 block discarded – undo
6683 6683
 			EXISTS (
6684 6684
 				SELECT bpv.id_board
6685 6685
 				FROM ' . $db_prefix . 'board_permissions_view AS bpv
6686
-				WHERE bpv.id_group IN ('. implode(',', $groups) .')
6686
+				WHERE bpv.id_group IN ('. implode(',', $groups) . ')
6687 6687
 					AND bpv.deny = 0
6688 6688
 					AND bpv.id_board = b.id_board
6689 6689
 			)';
@@ -6693,7 +6693,7 @@  discard block
 block discarded – undo
6693 6693
 			AND NOT EXISTS (
6694 6694
 				SELECT bpv.id_board
6695 6695
 				FROM ' . $db_prefix . 'board_permissions_view AS bpv
6696
-				WHERE bpv.id_group IN ( '. implode(',', $groups) .')
6696
+				WHERE bpv.id_group IN ( '. implode(',', $groups) . ')
6697 6697
 					AND bpv.deny = 1
6698 6698
 					AND bpv.id_board = b.id_board
6699 6699
 			)';
@@ -6956,8 +6956,8 @@  discard block
 block discarded – undo
6956 6956
 	$i = 0;
6957 6957
 	while (empty($done))
6958 6958
 	{
6959
-		if (strpos($format, '{'. --$i . '}') !== false)
6960
-			$replacements['{'. $i . '}'] = array_pop($list);
6959
+		if (strpos($format, '{' . --$i . '}') !== false)
6960
+			$replacements['{' . $i . '}'] = array_pop($list);
6961 6961
 		else
6962 6962
 			$done = true;
6963 6963
 	}
@@ -6967,8 +6967,8 @@  discard block
 block discarded – undo
6967 6967
 	$i = 0;
6968 6968
 	while (empty($done))
6969 6969
 	{
6970
-		if (strpos($format, '{'. ++$i . '}') !== false)
6971
-			$replacements['{'. $i . '}'] = array_shift($list);
6970
+		if (strpos($format, '{' . ++$i . '}') !== false)
6971
+			$replacements['{' . $i . '}'] = array_shift($list);
6972 6972
 		else
6973 6973
 			$done = true;
6974 6974
 	}
Please login to merge, or discard this patch.
Sources/Packages.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1155,7 +1155,7 @@
 block discarded – undo
1155 1155
 				// We're really just checking for entries which are create table AND add columns (etc).
1156 1156
 				$tables = array();
1157 1157
 
1158
-				usort($db_package_log, function ($a, $b)
1158
+				usort($db_package_log, function($a, $b)
1159 1159
 				{
1160 1160
 					if ($a[0] == $b[0])
1161 1161
 						return 0;
Please login to merge, or discard this patch.
Sources/Subs-Db-postgresql.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -73,7 +73,7 @@
 block discarded – undo
73 73
 		display_db_error();
74 74
 
75 75
 	// We need to escape ' and \
76
-	$db_passwd = str_replace(array('\\','\''), array('\\\\','\\\''), $db_passwd);
76
+	$db_passwd = str_replace(array('\\', '\''), array('\\\\', '\\\''), $db_passwd);
77 77
 
78 78
 	if (!empty($db_options['persist']))
79 79
 		$connection = @pg_pconnect((empty($db_server) ? '' : 'host=' . $db_server . ' ') . 'dbname=' . $db_name . ' user=\'' . $db_user . '\' password=\'' . $db_passwd . '\'' . (empty($db_options['port']) ? '' : ' port=\'' . $db_options['port'] . '\''));
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
@@ -741,7 +741,7 @@
 block discarded – undo
741 741
 							<div class="information noup">', $context['settings_message'], '</div>';
742 742
 
743 743
 	// Filter out any redundant separators before we start the loop
744
-	$context['config_vars'] = array_filter($context['config_vars'], function ($v) use ($context)
744
+	$context['config_vars'] = array_filter($context['config_vars'], function($v) use ($context)
745 745
 		{
746 746
 			static $config_vars, $prev;
747 747
 
Please login to merge, or discard this patch.
Themes/default/Profile.template.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1707,7 +1707,7 @@
 block discarded – undo
1707 1707
 		{
1708 1708
 			// Avoid double separators and empty titled sections
1709 1709
 			$empty_section = true;
1710
-			for ($j=$i+1; $j < count($context['theme_options']); $j++)
1710
+			for ($j = $i + 1; $j < count($context['theme_options']); $j++)
1711 1711
 			{
1712 1712
 				// Found another separator, so we're done
1713 1713
 				if (!is_array($context['theme_options'][$j]))
Please login to merge, or discard this patch.
Sources/Profile-View.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -262,7 +262,7 @@  discard block
 block discarded – undo
262 262
 			AND a.is_read = 0' : '') . (!empty($alertIDs) ? '
263 263
 			AND a.id_alert IN ({array_int:alertIDs})' : '') . '
264 264
 		ORDER BY id_alert DESC' . (!empty($limit) ? '
265
-		LIMIT {int:limit}' : '') . (!empty($offset) ?'
265
+		LIMIT {int:limit}' : '') . (!empty($offset) ? '
266 266
 		OFFSET {int:offset}' : ''),
267 267
 		array(
268 268
 			'id_member' => $memID,
@@ -1101,20 +1101,20 @@  discard block
 block discarded – undo
1101 1101
 		$context['posts'][$key]['quickbuttons'] = array(
1102 1102
 			'reply' => array(
1103 1103
 				'label' => $txt['reply'],
1104
-				'href' => $scripturl.'?action=post;topic='.$post['topic'].'.'.$post['start'],
1104
+				'href' => $scripturl . '?action=post;topic=' . $post['topic'] . '.' . $post['start'],
1105 1105
 				'icon' => 'reply_button',
1106 1106
 				'show' => $post['can_reply']
1107 1107
 			),
1108 1108
 			'quote' => array(
1109 1109
 				'label' => $txt['quote_action'],
1110
-				'href' => $scripturl.'?action=post;topic='.$post['topic'].'.'.$post['start'].';quote='.$post['id'],
1110
+				'href' => $scripturl . '?action=post;topic=' . $post['topic'] . '.' . $post['start'] . ';quote=' . $post['id'],
1111 1111
 				'icon' => 'quote',
1112 1112
 				'show' => $post['can_quote']
1113 1113
 			),
1114 1114
 			'remove' => array(
1115 1115
 				'label' => $txt['remove'],
1116
-				'href' => $scripturl.'?action=deletemsg;msg='.$post['id'].';topic='.$post['topic'].';profile;u='.$context['member']['id'].';start='.$context['start'].';'.$context['session_var'].'='.$context['session_id'],
1117
-				'javascript' => 'data-confirm="'.$txt['remove_message'].'" class="you_sure"',
1116
+				'href' => $scripturl . '?action=deletemsg;msg=' . $post['id'] . ';topic=' . $post['topic'] . ';profile;u=' . $context['member']['id'] . ';start=' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id'],
1117
+				'javascript' => 'data-confirm="' . $txt['remove_message'] . '" class="you_sure"',
1118 1118
 				'icon' => 'remove_button',
1119 1119
 				'show' => $post['can_delete']
1120 1120
 			)
Please login to merge, or discard this patch.