Passed
Pull Request — release-2.1 (#6088)
by Mathias
03:43
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)
@@ -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/ManageErrors.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -355,8 +355,8 @@
 block discarded – undo
355 355
 	elseif (isset($_POST['delall']) && isset($filter))
356 356
 	{
357 357
 		// ip need a different placeholder type
358
-		$filter_type = $filter['variable'] == 'ip'? 'inet' : 'string';
359
-		$filter_op = $filter['variable'] == 'ip'? '=' : 'LIKE';
358
+		$filter_type = $filter['variable'] == 'ip' ? 'inet' : 'string';
359
+		$filter_op = $filter['variable'] == 'ip' ? '=' : 'LIKE';
360 360
 		$smcFunc['db_query']('', '
361 361
 			DELETE FROM {db_prefix}log_errors
362 362
 			WHERE ' . $filter['variable'] . ' ' . $filter_op . ' {' . $filter_type . ':filter}',
Please login to merge, or discard this patch.