Completed
Push — release-2.1 ( 4d6619...b3268c )
by John
41s queued 21s
created
Sources/Profile-Modify.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -500,7 +500,7 @@  discard block
 block discarded – undo
500 500
 						log_error(sprintf($txt['smiley_set_dir_not_found'], $set_names[array_search($set, $context['smiley_sets'])]));
501 501
 
502 502
 						$context['smiley_sets'] = array_filter($context['smiley_sets'], function($v) use ($set)
503
-							{
503
+						{
504 504
 								return $v != $set;
505 505
 							});
506 506
 					}
@@ -3467,7 +3467,6 @@  discard block
 block discarded – undo
3467 3467
 			}
3468 3468
 		}
3469 3469
 	}
3470
-
3471 3470
 	elseif (($value == 'upload' && allowedTo('profile_upload_avatar')) || $downloadedExternalAvatar)
3472 3471
 	{
3473 3472
 		if ((isset($_FILES['attachment']['name']) && $_FILES['attachment']['name'] != '') || $downloadedExternalAvatar)
Please login to merge, or discard this patch.
Sources/SplitTopics.php 1 patch
Braces   -1 removed lines patch added patch discarded remove patch
@@ -869,7 +869,6 @@
 block discarded – undo
869 869
 		$can_approve_boards = boardsAllowedTo('approve_posts');
870 870
 		$onlyApproved = $can_approve_boards !== array(0) && !in_array($_REQUEST['targetboard'], $can_approve_boards);
871 871
 	}
872
-
873 872
 	else
874 873
 		$onlyApproved = false;
875 874
 
Please login to merge, or discard this patch.
Sources/Subs-Admin.php 1 patch
Braces   +10 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1197,7 +1197,8 @@  discard block
 block discarded – undo
1197 1197
 	}
1198 1198
 
1199 1199
 	// It's important to do the numbered ones before the named ones, or messes happen.
1200
-	uksort($substitutions, function($a, $b) {
1200
+	uksort($substitutions, function($a, $b)
1201
+	{
1201 1202
 		if (is_int($a) && is_int($b))
1202 1203
 			return $a > $b;
1203 1204
 		elseif (is_int($a))
@@ -1716,8 +1717,12 @@  discard block
 block discarded – undo
1716 1717
 		unset($mtime, $settingsFile, $settingsText);
1717 1718
 		$defined_vars = get_defined_vars();
1718 1719
 	}
1719
-	catch (Throwable $e) {}
1720
-	catch (ErrorException $e) {}
1720
+	catch (Throwable $e)
1721
+	{
1722
+}
1723
+	catch (ErrorException $e)
1724
+	{
1725
+}
1721 1726
 	if (isset($e))
1722 1727
 		return false;
1723 1728
 
@@ -1877,7 +1882,8 @@  discard block
 block discarded – undo
1877 1882
 	// For the same reason, replace literal returns and newlines with "\r" and "\n"
1878 1883
 	elseif (is_string($var) && (strpos($var, "\n") !== false || strpos($var, "\r") !== false))
1879 1884
 	{
1880
-		return strtr(preg_replace_callback('/[\r\n]+/', function($m) {
1885
+		return strtr(preg_replace_callback('/[\r\n]+/', function($m)
1886
+		{
1881 1887
 			return '\' . "' . strtr($m[0], array("\r" => '\r', "\n" => '\n')) . '" . \'';
1882 1888
 		}, $var), array("'' . " => '', " . ''" => ''));
1883 1889
 	}
Please login to merge, or discard this patch.
cron.php 1 patch
Braces   -1 removed lines patch added patch discarded remove patch
@@ -93,7 +93,6 @@
 block discarded – undo
93 93
 	if ($ts <= 0 || $ts % 15 != 0 || time() - $ts < 0 || time() - $ts > 20)
94 94
 		obExit_cron();
95 95
 }
96
-
97 96
 else
98 97
 	$_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.0';
99 98
 
Please login to merge, or discard this patch.
Sources/tasks/CreatePost-Notify.php 1 patch
Braces   -1 removed lines patch added patch discarded remove patch
@@ -266,7 +266,6 @@
 block discarded – undo
266 266
 				$user_info = $real_user_info;
267 267
 				unset($real_user_info);
268 268
 			}
269
-
270 269
 			else
271 270
 				$user_info = null;
272 271
 
Please login to merge, or discard this patch.
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)
@@ -925,7 +925,6 @@  discard block
 block discarded – undo
925 925
 			$user_settings_min[$row['id_member']]['time_offset'] = ($tz_user->getOffset($time_user) -
926 926
 					$tz_system->getOffset($time_system)) / 3600;
927 927
 		}
928
-
929 928
 		else
930 929
 			$user_settings_min[$row['id_member']]['time_offset'] = empty($row['time_offset']) ? 0 : $row['time_offset'];
931 930
 	}
@@ -1655,7 +1654,6 @@  discard block
 block discarded – undo
1655 1654
 			$time_user = new DateTime('now', $tz_user);
1656 1655
 			$profile['time_offset'] = ($tz_user->getOffset($time_user) - $tz_system->getOffset($time_system)) / 3600;
1657 1656
 		}
1658
-
1659 1657
 		else
1660 1658
 		{
1661 1659
 			// !!! Compatibility.
@@ -2318,7 +2316,6 @@  discard block
 block discarded – undo
2318 2316
 		loadLanguage('index+Modifications');
2319 2317
 		$context['template_layers'] = array();
2320 2318
 	}
2321
-
2322 2319
 	else
2323 2320
 	{
2324 2321
 		// Custom templates to load, or just default?
@@ -2699,14 +2696,12 @@  discard block
 block discarded – undo
2699 2696
 				$fileUrl = $settings['default_theme_url'] . '/css/' . $fileName;
2700 2697
 				$filePath = $settings['default_theme_dir'] . '/css/' . $fileName;
2701 2698
 			}
2702
-
2703 2699
 			else
2704 2700
 			{
2705 2701
 				$fileUrl = false;
2706 2702
 				$filePath = false;
2707 2703
 			}
2708 2704
 		}
2709
-
2710 2705
 		else
2711 2706
 		{
2712 2707
 			$fileUrl = $settings[$themeRef . '_url'] . '/css/' . $fileName;
@@ -2814,14 +2809,12 @@  discard block
 block discarded – undo
2814 2809
 				$fileUrl = $settings['default_theme_url'] . '/scripts/' . $fileName;
2815 2810
 				$filePath = $settings['default_theme_dir'] . '/scripts/' . $fileName;
2816 2811
 			}
2817
-
2818 2812
 			else
2819 2813
 			{
2820 2814
 				$fileUrl = false;
2821 2815
 				$filePath = false;
2822 2816
 			}
2823 2817
 		}
2824
-
2825 2818
 		else
2826 2819
 		{
2827 2820
 			$fileUrl = $settings[$themeRef . '_url'] . '/scripts/' . $fileName;
Please login to merge, or discard this patch.
Sources/tasks/ExportProfileData.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -119,7 +119,9 @@
 block discarded – undo
119 119
 
120 120
 		$feed_meta = array(
121 121
 			'title' => sprintf($txt['profile_of_username'], $user_profile[$uid]['real_name']),
122
-			'desc' => sentence_list(array_map(function ($datatype) use ($txt) { return $txt[$datatype]; }, array_keys($included))),
122
+			'desc' => sentence_list(array_map(function ($datatype) use ($txt)
123
+			{
124
+return $txt[$datatype]; }, array_keys($included))),
123 125
 			'author' => $mbname,
124 126
 			'source' => $scripturl . '?action=profile;u=' . $uid,
125 127
 			'self' => $scripturl . '?action=profile;area=download;u=' . $uid . ';t=' . hash_hmac('sha1', $idhash, get_auth_secret()),
Please login to merge, or discard this patch.
Sources/Profile-Actions.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1396,7 +1396,9 @@
 block discarded – undo
1396 1396
 
1397 1397
 	// Figure out the filename we'll tell the browser.
1398 1398
 	$datatypes = file_exists($progressfile) ? array_keys($smcFunc['json_decode'](file_get_contents($progressfile), true)) : array('profile');
1399
-	$included_desc = array_map(function ($datatype) use ($txt) { return $txt[$datatype]; }, $datatypes);
1399
+	$included_desc = array_map(function ($datatype) use ($txt)
1400
+	{
1401
+return $txt[$datatype]; }, $datatypes);
1400 1402
 
1401 1403
 	$dlfilename = array_merge(array($context['forum_name'], $context['member']['username']), $included_desc);
1402 1404
 	$dlfilename = preg_replace('/[^\p{L}\p{M}\p{N}_]+/u', '-', str_replace('"', '', un_htmlspecialchars(strip_tags(implode('_', $dlfilename)))));
Please login to merge, or discard this patch.
Sources/Subs.php 1 patch
Braces   +3 added lines, -9 removed lines patch added patch discarded remove patch
@@ -279,7 +279,6 @@  discard block
 block discarded – undo
279 279
 		$condition = 'id_member IN ({array_int:members})';
280 280
 		$parameters['members'] = $members;
281 281
 	}
282
-
283 282
 	elseif ($members === null)
284 283
 		$condition = '1=1';
285 284
 
@@ -382,11 +381,9 @@  discard block
 block discarded – undo
382 381
 				$val = $val . ' END';
383 382
 				$type = 'raw';
384 383
 			}
385
-
386 384
 			else
387 385
 				$val = alert_count($members, true);
388 386
 		}
389
-
390 387
 		elseif ($type == 'int' && ($val === '+' || $val === '-'))
391 388
 		{
392 389
 			$val = $var . ' ' . $val . ' 1';
@@ -2170,12 +2167,12 @@  discard block
 block discarded – undo
2170 2167
 			'tag' => 'cowsay',
2171 2168
 			'parameters' => array(
2172 2169
 				'e' => array('optional' => true, 'quoted' => true, 'match' => '(.*?)', 'default' => 'oo', 'validate' => function ($eyes) use ($smcFunc)
2173
-					{
2170
+				{
2174 2171
 						return $smcFunc['substr']($eyes . 'oo', 0, 2);
2175 2172
 					},
2176 2173
 				),
2177 2174
 				't' => array('optional' => true, 'quoted' => true, 'match' => '(.*?)', 'default' => '  ', 'validate' => function ($tongue) use ($smcFunc)
2178
-					{
2175
+				{
2179 2176
 						return $smcFunc['substr']($tongue . '  ', 0, 2);
2180 2177
 					},
2181 2178
 				),
@@ -3273,7 +3270,7 @@  discard block
 block discarded – undo
3273 3270
 
3274 3271
 	// Replace away!
3275 3272
 	$message = preg_replace_callback($smileyPregSearch, function($matches) use ($smileyPregReplacements)
3276
-		{
3273
+	{
3277 3274
 			return $smileyPregReplacements[$matches[1]];
3278 3275
 		}, $message);
3279 3276
 }
@@ -4071,7 +4068,6 @@  discard block
 block discarded – undo
4071 4068
 				if (!isset($minSeed) && isset($js_file['options']['seed']))
4072 4069
 					$minSeed = $js_file['options']['seed'];
4073 4070
 			}
4074
-
4075 4071
 			else
4076 4072
 			{
4077 4073
 				echo '
@@ -6354,7 +6350,6 @@  discard block
 block discarded – undo
6354 6350
 			$isWritable = true;
6355 6351
 			break;
6356 6352
 		}
6357
-
6358 6353
 		else
6359 6354
 			@chmod($file, $val);
6360 6355
 	}
@@ -7286,7 +7281,6 @@  discard block
 block discarded – undo
7286 7281
 
7287 7282
             $length += array_length($value, $deep_count);
7288 7283
         }
7289
-
7290 7284
         else
7291 7285
             $length += strlen($value);
7292 7286
     }
Please login to merge, or discard this patch.