Passed
Pull Request — release-2.1 (#7237)
by John
04:12
created
Sources/tasks/CreatePost-Notify.php 2 patches
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.
Spacing   +4 added lines, -6 removed lines patch added patch discarded remove patch
@@ -174,7 +174,7 @@  discard block
 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
 			return empty($member['sent']);
179 179
 		});
180 180
 
@@ -187,7 +187,7 @@  discard block
 block discarded – undo
187 187
 			$this->members['mentioned'] = array_intersect_key($this->members['mentioned'], $unnotified);
188 188
 
189 189
 			// Notifications about modified posts only go to members who were mentioned or quoted
190
-			$this->members['watching'] = $type == 'edit' ? array(): $unnotified;
190
+			$this->members['watching'] = $type == 'edit' ? array() : $unnotified;
191 191
 
192 192
 			// If this post has no quotes or mentions, just delete any obsolete alerts and bail out.
193 193
 			if (empty($this->members['quoted']) && empty($this->members['mentioned']))
@@ -497,8 +497,7 @@  discard block
 block discarded – undo
497 497
 			if (!empty($member_data['id_topic']) && $type != 'topic' && !empty($this->prefs[$member_id]))
498 498
 			{
499 499
 				$pref = !empty($this->prefs[$member_id]['topic_notify_' . $topicOptions['id']]) ?
500
-					$this->prefs[$member_id]['topic_notify_' . $topicOptions['id']] :
501
-					(!empty($this->prefs[$member_id]['topic_notify']) ? $this->prefs[$member_id]['topic_notify'] : 0);
500
+					$this->prefs[$member_id]['topic_notify_' . $topicOptions['id']] : (!empty($this->prefs[$member_id]['topic_notify']) ? $this->prefs[$member_id]['topic_notify'] : 0);
502 501
 
503 502
 				$message_type = 'notification_' . $type;
504 503
 
@@ -517,8 +516,7 @@  discard block
 block discarded – undo
517 516
 			elseif ($type == 'topic')
518 517
 			{
519 518
 				$pref = !empty($this->prefs[$member_id]['board_notify_' . $topicOptions['board']]) ?
520
-					$this->prefs[$member_id]['board_notify_' . $topicOptions['board']] :
521
-					(!empty($this->prefs[$member_id]['board_notify']) ? $this->prefs[$member_id]['board_notify'] : 0);
519
+					$this->prefs[$member_id]['board_notify_' . $topicOptions['board']] : (!empty($this->prefs[$member_id]['board_notify']) ? $this->prefs[$member_id]['board_notify'] : 0);
522 520
 
523 521
 				$content_type = 'board';
524 522
 
Please login to merge, or discard this patch.
index.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
 require_once($sourcedir . '/Security.php');
79 79
 
80 80
 // If $maintenance is set specifically to 2, then we're upgrading or something.
81
-if (!empty($maintenance) &&  2 === $maintenance)
81
+if (!empty($maintenance) && 2 === $maintenance)
82 82
 {
83 83
 	display_maintenance_message();
84 84
 }
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
  *
95 95
  * @param string $class The fully-qualified class name.
96 96
  */
97
-spl_autoload_register(function ($class) use ($sourcedir)
97
+spl_autoload_register(function($class) use ($sourcedir)
98 98
 {
99 99
 	$classMap = array(
100 100
 		'ReCaptcha\\' => 'ReCaptcha/',
Please login to merge, or discard this patch.
Sources/MessageIndex.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -340,7 +340,7 @@
 block discarded – undo
340 340
 		WHERE t.id_board = {int:current_board} '
341 341
 			. (!$modSettings['postmod_active'] || $context['can_approve_posts'] ? '' : '
342 342
 			AND (t.approved = {int:is_approved}' . ($user_info['is_guest'] ? '' : ' OR t.id_member_started = {int:current_member}') . ')') . (!empty($message_index_topic_wheres) ? '
343
-			AND ' . implode("\n\t\t\t\tAND ", $message_index_topic_wheres) : ''). '
343
+			AND ' . implode("\n\t\t\t\tAND ", $message_index_topic_wheres) : '') . '
344 344
 		ORDER BY is_sticky' . ($fake_ascending ? '' : ' DESC') . ', ' . $_REQUEST['sort'] . ($ascending ? '' : ' DESC') . '
345 345
 		LIMIT {int:maxindex}
346 346
 			OFFSET {int:start} ';
Please login to merge, or discard this patch.
Sources/News.php 2 patches
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
 	);
92 92
 	foreach (array('action', 'sa', 'type', 'board', 'boards', 'c', 'u', 'limit', 'offset') as $var)
93 93
 		if (isset($_GET[$var]))
94
-			$feed_meta['self'] .= ($feed_meta['self'] === $scripturl ? '?' : ';' ) . $var . '=' . $_GET[$var];
94
+			$feed_meta['self'] .= ($feed_meta['self'] === $scripturl ? '?' : ';') . $var . '=' . $_GET[$var];
95 95
 
96 96
 	// Handle the cases where a board, boards, or category is asked for.
97 97
 	$query_this_board = 1;
@@ -303,17 +303,17 @@  discard block
 block discarded – undo
303 303
 	 * namespaces, which could cause it to mangle the XML horrifically
304 304
 	 * during processing.
305 305
 	 */
306
-	$smf_ns = 'htt'.'p:/'.'/ww'.'w.simple'.'machines.o'.'rg/xml/' . $subaction;
306
+	$smf_ns = 'htt' . 'p:/' . '/ww' . 'w.simple' . 'machines.o' . 'rg/xml/' . $subaction;
307 307
 
308 308
 	// Allow mods to add extra namespaces and tags to the feed/channel
309 309
 	$namespaces = array(
310 310
 		'rss' => array(),
311
-		'rss2' => array('atom' => 'htt'.'p:/'.'/ww'.'w.w3.o'.'rg/2005/Atom'),
312
-		'atom' => array('' => 'htt'.'p:/'.'/ww'.'w.w3.o'.'rg/2005/Atom'),
311
+		'rss2' => array('atom' => 'htt' . 'p:/' . '/ww' . 'w.w3.o' . 'rg/2005/Atom'),
312
+		'atom' => array('' => 'htt' . 'p:/' . '/ww' . 'w.w3.o' . 'rg/2005/Atom'),
313 313
 		'rdf' => array(
314
-			'' => 'htt'.'p:/'.'/purl.o'.'rg/rss/1.0/',
315
-			'rdf' => 'htt'.'p:/'.'/ww'.'w.w3.o'.'rg/1999/02/22-rdf-syntax-ns#',
316
-			'dc' => 'htt'.'p:/'.'/purl.o'.'rg/dc/elements/1.1/',
314
+			'' => 'htt' . 'p:/' . '/purl.o' . 'rg/rss/1.0/',
315
+			'rdf' => 'htt' . 'p:/' . '/ww' . 'w.w3.o' . 'rg/1999/02/22-rdf-syntax-ns#',
316
+			'dc' => 'htt' . 'p:/' . '/purl.o' . 'rg/dc/elements/1.1/',
317 317
 		),
318 318
 		'smf' => array(
319 319
 			'smf' => $smf_ns,
@@ -2127,7 +2127,7 @@  discard block
 block discarded – undo
2127 2127
 			m.id_msg, m.id_topic, m.id_board, m.id_member, m.poster_email, m.poster_ip,
2128 2128
 			m.poster_time, m.subject, m.modified_time, m.modified_name, m.modified_reason, m.body,
2129 2129
 			m.likes, m.approved, m.smileys_enabled
2130
-		FROM {db_prefix}messages AS m' . ($modSettings['postmod_active'] && !$show_all ?'
2130
+		FROM {db_prefix}messages AS m' . ($modSettings['postmod_active'] && !$show_all ? '
2131 2131
 			INNER JOIN {db_prefix}topics AS t ON (t.id_topic = m.id_topic)' : '') . '
2132 2132
 		WHERE m.id_member = {int:uid}
2133 2133
 			AND m.id_msg > {int:start_after}
Please login to merge, or discard this patch.
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2202,7 +2202,7 @@
 block discarded – undo
2202 2202
 					function($a, $b)
2203 2203
 					{
2204 2204
 						if ($a['filesize'] == $b['filesize'])
2205
-					        return 0;
2205
+							return 0;
2206 2206
 
2207 2207
 						return ($a['filesize'] < $b['filesize']) ? -1 : 1;
2208 2208
 					}
Please login to merge, or discard this patch.
Sources/tasks/ExportProfileData.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -204,7 +204,7 @@  discard block
 block discarded – undo
204 204
 		$feed_meta = array(
205 205
 			'title' => sprintf($txt['profile_of_username'], $user_profile[$uid]['real_name']),
206 206
 			'desc' => sentence_list(array_map(
207
-				function ($datatype) use ($txt)
207
+				function($datatype) use ($txt)
208 208
 				{
209 209
 					return $txt[$datatype];
210 210
 				},
@@ -726,7 +726,7 @@  discard block
 block discarded – undo
726 726
 					'src' => 'src="' . $currentAttachment['href'] . '" onerror="$(\'.dlattach_' . $currentAttachment['id'] . '\').show(); $(\'.dlattach_' . $currentAttachment['id'] . '\').css({\'position\': \'absolute\'});"',
727 727
 				),
728 728
 				$returnContext
729
-			) . $hidden_orig_link . '</span>' ;
729
+			) . $hidden_orig_link . '</span>';
730 730
 		}
731 731
 		elseif (strpos($currentAttachment['mime_type'], 'video/') === 0)
732 732
 		{
Please login to merge, or discard this patch.
Sources/Post.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1277,7 +1277,7 @@
 block discarded – undo
1277 1277
 	if ($context['can_post_attachment'])
1278 1278
 	{
1279 1279
 		$acceptedFiles = empty($context['allowed_extensions']) ? '' : implode(',', array_map(
1280
-			function ($val) use ($smcFunc)
1280
+			function($val) use ($smcFunc)
1281 1281
 			{
1282 1282
 				return !empty($val) ? ('.' . $smcFunc['htmltrim']($val)) : '';
1283 1283
 			},
Please login to merge, or discard this patch.
Sources/Profile-Export.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -469,7 +469,7 @@  discard block
 block discarded – undo
469 469
 	// Figure out the filename we'll tell the browser.
470 470
 	$datatypes = file_exists($progressfile) ? array_keys($smcFunc['json_decode'](file_get_contents($progressfile), true)) : array('profile');
471 471
 	$included_desc = array_map(
472
-		function ($datatype) use ($txt)
472
+		function($datatype) use ($txt)
473 473
 		{
474 474
 			return $txt[$datatype];
475 475
 		},
@@ -789,9 +789,9 @@  discard block
 block discarded – undo
789 789
 	$xslt_variables = array();
790 790
 
791 791
 	// Do not change any of these to HTTPS URLs. For explanation, see comments in the buildXmlFeed() function.
792
-	$smf_ns = 'htt'.'p:/'.'/ww'.'w.simple'.'machines.o'.'rg/xml/profile';
793
-	$xslt_ns = 'htt'.'p:/'.'/ww'.'w.w3.o'.'rg/1999/XSL/Transform';
794
-	$html_ns = 'htt'.'p:/'.'/ww'.'w.w3.o'.'rg/1999/xhtml';
792
+	$smf_ns = 'htt' . 'p:/' . '/ww' . 'w.simple' . 'machines.o' . 'rg/xml/profile';
793
+	$xslt_ns = 'htt' . 'p:/' . '/ww' . 'w.w3.o' . 'rg/1999/XSL/Transform';
794
+	$html_ns = 'htt' . 'p:/' . '/ww' . 'w.w3.o' . 'rg/1999/xhtml';
795 795
 
796 796
 	require_once($sourcedir . DIRECTORY_SEPARATOR . 'News.php');
797 797
 
@@ -1696,14 +1696,14 @@  discard block
 block discarded – undo
1696 1696
 
1697 1697
 		if (!empty($context['export_css_header']))
1698 1698
 		{
1699
-			$stylesheet['css_js'] .=  '
1699
+			$stylesheet['css_js'] .= '
1700 1700
 			<style><![CDATA[' . "\n" . implode("\n", $context['export_css_header']) . "\n" . ']]>
1701 1701
 			</style>';
1702 1702
 		}
1703 1703
 
1704 1704
 		if (!empty($context['export_javascript_vars']))
1705 1705
 		{
1706
-			$stylesheet['css_js'] .=  '
1706
+			$stylesheet['css_js'] .= '
1707 1707
 			<script><![CDATA[';
1708 1708
 
1709 1709
 			foreach ($context['export_javascript_vars'] as $var => $val)
@@ -1739,7 +1739,7 @@  discard block
 block discarded – undo
1739 1739
 
1740 1740
 		if (!empty($context['export_javascript_inline']['standard']))
1741 1741
 		{
1742
-			$stylesheet['css_js'] .=  '
1742
+			$stylesheet['css_js'] .= '
1743 1743
 			<script><![CDATA[' . "\n" . implode("\n", $context['export_javascript_inline']['standard']) . "\n" . ']]>
1744 1744
 			</script>';
1745 1745
 		}
@@ -1751,7 +1751,7 @@  discard block
 block discarded – undo
1751 1751
 
1752 1752
 			$stylesheet['css_js'] .= "\n\t" . str_replace("\n", "\n\t", implode("\n", $context['export_javascript_inline']['defer']));
1753 1753
 
1754
-			$stylesheet['css_js'] .= "\n" . '});'. "\n" . ']]>
1754
+			$stylesheet['css_js'] .= "\n" . '});' . "\n" . ']]>
1755 1755
 			</script>';
1756 1756
 		}
1757 1757
 
@@ -1834,7 +1834,7 @@  discard block
 block discarded – undo
1834 1834
 
1835 1835
 	usort(
1836 1836
 		$context['css_files'],
1837
-		function ($a, $b)
1837
+		function($a, $b)
1838 1838
 		{
1839 1839
 			return $a['options']['order_pos'] < $b['options']['order_pos'] ? -1 : ($a['options']['order_pos'] > $b['options']['order_pos'] ? 1 : 0);
1840 1840
 		}
Please login to merge, or discard this patch.
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.