Passed
Pull Request — release-2.1 (#6101)
by Jon
03:54
created
Sources/Load.php 1 patch
Braces   +1 added lines, -8 removed lines patch added patch discarded remove patch
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
 	// Set a list of common functions.
105 105
 	$ent_list = '&(?:#' . (empty($modSettings['disableEntityCheck']) ? '\d{1,7}' : '021') . '|quot|amp|lt|gt|nbsp);';
106 106
 	$ent_check = empty($modSettings['disableEntityCheck']) ? function($string)
107
-		{
107
+	{
108 108
 			$string = preg_replace_callback('~(&#(\d{1,7}|x[0-9a-fA-F]{1,6});)~', 'entity_fix__callback', $string);
109 109
 			return $string;
110 110
 		} : function($string)
@@ -929,7 +929,6 @@  discard block
 block discarded – undo
929 929
 			$user_info_min[$row['id_member']]['time_offset'] = ($tz_user->getOffset($time_user) -
930 930
 					$tz_system->getOffset($time_system)) / 3600;
931 931
 		}
932
-
933 932
 		else
934 933
 			$user_info_min[$row['id_member']]['time_offset'] = empty($row['time_offset']) ? 0 : $row['time_offset'];
935 934
 	}
@@ -1658,7 +1657,6 @@  discard block
 block discarded – undo
1658 1657
 			$time_user = new DateTime('now', $tz_user);
1659 1658
 			$profile['time_offset'] = ($tz_user->getOffset($time_user) - $tz_system->getOffset($time_system)) / 3600;
1660 1659
 		}
1661
-
1662 1660
 		else
1663 1661
 		{
1664 1662
 			// !!! Compatibility.
@@ -2321,7 +2319,6 @@  discard block
 block discarded – undo
2321 2319
 		loadLanguage('index+Modifications');
2322 2320
 		$context['template_layers'] = array();
2323 2321
 	}
2324
-
2325 2322
 	else
2326 2323
 	{
2327 2324
 		// Custom templates to load, or just default?
@@ -2702,14 +2699,12 @@  discard block
 block discarded – undo
2702 2699
 				$fileUrl = $settings['default_theme_url'] . '/css/' . $fileName;
2703 2700
 				$filePath = $settings['default_theme_dir'] . '/css/' . $fileName;
2704 2701
 			}
2705
-
2706 2702
 			else
2707 2703
 			{
2708 2704
 				$fileUrl = false;
2709 2705
 				$filePath = false;
2710 2706
 			}
2711 2707
 		}
2712
-
2713 2708
 		else
2714 2709
 		{
2715 2710
 			$fileUrl = $settings[$themeRef . '_url'] . '/css/' . $fileName;
@@ -2817,14 +2812,12 @@  discard block
 block discarded – undo
2817 2812
 				$fileUrl = $settings['default_theme_url'] . '/scripts/' . $fileName;
2818 2813
 				$filePath = $settings['default_theme_dir'] . '/scripts/' . $fileName;
2819 2814
 			}
2820
-
2821 2815
 			else
2822 2816
 			{
2823 2817
 				$fileUrl = false;
2824 2818
 				$filePath = false;
2825 2819
 			}
2826 2820
 		}
2827
-
2828 2821
 		else
2829 2822
 		{
2830 2823
 			$fileUrl = $settings[$themeRef . '_url'] . '/scripts/' . $fileName;
Please login to merge, or discard this patch.
Sources/tasks/ExportProfileData.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
152 152
 
153 153
 		$feed_meta = array(
154 154
 			'title' => sprintf($txt['profile_of_username'], $user_profile[$uid]['real_name']),
155
-			'desc' => sentence_list(array_map(function ($datatype) use ($txt) { return $txt[$datatype]; }, array_keys($included))),
155
+			'desc' => sentence_list(array_map(function($datatype) use ($txt) { return $txt[$datatype]; }, array_keys($included))),
156 156
 			'author' => $mbname,
157 157
 			'source' => $scripturl . '?action=profile;u=' . $uid,
158 158
 			'self' => '', // Unused, but can't be null.
@@ -640,7 +640,7 @@  discard block
 block discarded – undo
640 640
 					'src' => 'src="' . $currentAttachment['href'] . '" onerror="$(\'.dlattach_' . $currentAttachment['id'] . '\').show(); $(\'.dlattach_' . $currentAttachment['id'] . '\').css({\'position\': \'absolute\'});"',
641 641
 				),
642 642
 				$returnContext
643
-			) . $hidden_orig_link . '</span>' ;
643
+			) . $hidden_orig_link . '</span>';
644 644
 		}
645 645
 		elseif (strpos($currentAttachment['mime_type'], 'video/') === 0)
646 646
 		{
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -152,7 +152,9 @@
 block discarded – undo
152 152
 
153 153
 		$feed_meta = array(
154 154
 			'title' => sprintf($txt['profile_of_username'], $user_profile[$uid]['real_name']),
155
-			'desc' => sentence_list(array_map(function ($datatype) use ($txt) { return $txt[$datatype]; }, array_keys($included))),
155
+			'desc' => sentence_list(array_map(function ($datatype) use ($txt)
156
+			{
157
+return $txt[$datatype]; }, array_keys($included))),
156 158
 			'author' => $mbname,
157 159
 			'source' => $scripturl . '?action=profile;u=' . $uid,
158 160
 			'self' => '', // Unused, but can't be null.
Please login to merge, or discard this patch.
Sources/Profile-Export.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -468,7 +468,7 @@  discard block
 block discarded – undo
468 468
 
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
-	$included_desc = array_map(function ($datatype) use ($txt) { return $txt[$datatype]; }, $datatypes);
471
+	$included_desc = array_map(function($datatype) use ($txt) { return $txt[$datatype]; }, $datatypes);
472 472
 
473 473
 	$dlfilename = array_merge(array($context['forum_name'], $context['member']['username']), $included_desc);
474 474
 	$dlfilename = preg_replace('/[^\p{L}\p{M}\p{N}_]+/u', '-', str_replace('"', '', un_htmlspecialchars(strip_tags(implode('_', $dlfilename)))));
@@ -790,9 +790,9 @@  discard block
 block discarded – undo
790 790
 		$context['xslt_settings'] = array(
791 791
 			// Do not change any of these to HTTPS URLs. For explanation, see comments in the buildXmlFeed() function.
792 792
 			'namespaces' => array(
793
-				'xsl' => 'htt'.'p:/'.'/ww'.'w.w3.o'.'rg/1999/XSL/Transform',
794
-				'smf' => 'htt'.'p:/'.'/ww'.'w.simple'.'machines.o'.'rg/xml/profile',
795
-				'html' => 'htt'.'p:/'.'/ww'.'w.w3.o'.'rg/1999/xhtml',
793
+				'xsl' => 'htt' . 'p:/' . '/ww' . 'w.w3.o' . 'rg/1999/XSL/Transform',
794
+				'smf' => 'htt' . 'p:/' . '/ww' . 'w.simple' . 'machines.o' . 'rg/xml/profile',
795
+				'html' => 'htt' . 'p:/' . '/ww' . 'w.w3.o' . 'rg/1999/xhtml',
796 796
 			),
797 797
 			'exclude-result-prefixes' => array('smf', 'html'),
798 798
 			'output' => array(
@@ -981,7 +981,7 @@  discard block
 block discarded – undo
981 981
 	$css_to_minify = array();
982 982
 	$normal_css_files = array();
983 983
 
984
-	usort($context['css_files'], function ($a, $b)
984
+	usort($context['css_files'], function($a, $b)
985 985
 	{
986 986
 		return $a['options']['order_pos'] < $b['options']['order_pos'] ? -1 : ($a['options']['order_pos'] > $b['options']['order_pos'] ? 1 : 0);
987 987
 	});
Please login to merge, or discard this patch.
Themes/default/Xslt.template.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
 	$header .= '<xsl:stylesheet version="' . (!empty($context['xslt_settings']['version']) ? $context['xslt_settings']['version'] : '1.0') . '"';
69 69
 
70 70
 	// XSL's own namespace declaration is required no matter what.
71
-	$context['xslt_settings']['namespaces']['xsl'] = 'htt'.'p:/'.'/ww'.'w.w3.o'.'rg/1999/XSL/Transform';
71
+	$context['xslt_settings']['namespaces']['xsl'] = 'htt' . 'p:/' . '/ww' . 'w.w3.o' . 'rg/1999/XSL/Transform';
72 72
 
73 73
 	foreach ($context['xslt_settings']['namespaces'] as $ns_prefix => $ns_uri)
74 74
 	{
@@ -1064,14 +1064,14 @@  discard block
 block discarded – undo
1064 1064
 
1065 1065
 	if (!empty($context['export_css_header']))
1066 1066
 	{
1067
-		$template .=  '
1067
+		$template .= '
1068 1068
 			<style><![CDATA[' . "\n" . implode("\n", $context['export_css_header']) . "\n" . ']]>
1069 1069
 			</style>';
1070 1070
 	}
1071 1071
 
1072 1072
 	if (!empty($context['export_javascript_vars']))
1073 1073
 	{
1074
-		$template .=  '
1074
+		$template .= '
1075 1075
 			<script><![CDATA[';
1076 1076
 
1077 1077
 		foreach ($context['export_javascript_vars'] as $var => $val)
@@ -1107,7 +1107,7 @@  discard block
 block discarded – undo
1107 1107
 
1108 1108
 	if (!empty($context['export_javascript_inline']['standard']))
1109 1109
 	{
1110
-		$template .=  '
1110
+		$template .= '
1111 1111
 			<script><![CDATA[' . "\n" . implode("\n", $context['export_javascript_inline']['standard']) . "\n" . ']]>
1112 1112
 			</script>';
1113 1113
 	}
@@ -1119,7 +1119,7 @@  discard block
 block discarded – undo
1119 1119
 
1120 1120
 		$template .= "\n\t" . str_replace("\n", "\n\t", implode("\n", $context['export_javascript_inline']['defer']));
1121 1121
 
1122
-		$template .= "\n" . '});'. "\n" . ']]>
1122
+		$template .= "\n" . '});' . "\n" . ']]>
1123 1123
 			</script>';
1124 1124
 	}
1125 1125
 
Please login to merge, or discard this patch.