Passed
Pull Request — release-2.1 (#5201)
by Michael
04:37
created
ssi_examples.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -89,7 +89,9 @@
 block discarded – undo
89 89
 						<li><a href="#" onclick="showSSIBlock('ssi_quickSearch'); return false;">Quick Search Box</a></li>
90 90
 						<li><a href="#" onclick="showSSIBlock('ssi_recentAttachments'); return false;">Recent Attachments</a></li>
91 91
 					</ul>
92
-					<?php if ($user_info['is_admin']) { ?>
92
+					<?php if ($user_info['is_admin'])
93
+{
94
+?>
93 95
 					<h3>Advanced Functions <img class="help" title="Functions that require additional tweaking, not just copy and paste." src="<?php echo $settings['images_url']; ?>/helptopics.png" alt=""></h3>
94 96
 					<ul>
95 97
 						<li><a href="#" onclick="showSSIBlock('ssi_showPoll'); return false;">Show Single Poll</a></li>
Please login to merge, or discard this patch.
Sources/Themes.php 1 patch
Braces   -1 removed lines patch added patch discarded remove patch
@@ -1364,7 +1364,6 @@
 block discarded – undo
1364 1364
 		// return all the info.
1365 1365
 		return $context['to_install'];
1366 1366
 	}
1367
-
1368 1367
 	else
1369 1368
 		fatal_lang_error('theme_install_error_title', false);
1370 1369
 }
Please login to merge, or discard this patch.
Sources/Subs-BoardIndex.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -419,7 +419,7 @@
 block discarded – undo
419 419
 					$board['last_post']['last_post_message'] = sprintf($txt['last_post_message'], $board['last_post']['member']['link'], $board['last_post']['link'], $board['last_post']['time'] > 0 ? timeformat($board['last_post']['time']) : $txt['not_applicable']);
420 420
 			}
421 421
 		}
422
-	else
422
+		else
423 423
 		foreach ($this_category as &$board )
424 424
 		{
425 425
 			if (!empty($moderators[$board['id']]))
Please login to merge, or discard this patch.
Sources/tasks/Birthday-Notify.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@
 block discarded – undo
23 23
      * @return bool Always returns true
24 24
      */
25 25
 	public function execute()
26
- 	{
26
+	{
27 27
 		global $txt, $smcFunc, $txtBirthdayEmails, $modSettings, $sourcedir;
28 28
 
29 29
 		$greeting = isset($modSettings['birthday_email']) ? $modSettings['birthday_email'] : 'happy_birthday';
Please login to merge, or discard this patch.
Sources/tasks/GroupReq-Notify.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@
 block discarded – undo
24 24
 	 * @return bool Always returns true.
25 25
 	 */
26 26
 	public function execute()
27
- 	{
27
+	{
28 28
  		global $sourcedir, $smcFunc, $language, $modSettings, $scripturl;
29 29
 
30 30
 		// Do we have any group moderators?
Please login to merge, or discard this patch.
Sources/tasks/UpdateTldRegex.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@
 block discarded – undo
23 23
      * @return bool Always returns true
24 24
      */
25 25
 	public function execute()
26
- 	{
26
+	{
27 27
 		global $sourcedir;
28 28
 
29 29
 		require_once($sourcedir . '/Subs.php');
Please login to merge, or discard this patch.
Sources/tasks/EventNew-Notify.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@
 block discarded – undo
24 24
 	 * @return bool Always returns true
25 25
 	 */
26 26
 	public function execute()
27
- 	{
27
+	{
28 28
  		global $sourcedir, $smcFunc, $user_profile;
29 29
 
30 30
 		// Get everyone who could be notified - those are the people who can see the calendar.
Please login to merge, or discard this patch.
Sources/tasks/Buddy-Notify.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@
 block discarded – undo
23 23
 	 * @return bool Always returns true
24 24
 	 */
25 25
 	public function execute()
26
- 	{
26
+	{
27 27
  		global $smcFunc, $sourcedir;
28 28
 
29 29
 		// Figure out if the user wants to be notified.
Please login to merge, or discard this patch.
Sources/SplitTopics.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1076,7 +1076,8 @@
 block discarded – undo
1076 1076
 		{
1077 1077
 			unset($topics[$row['id_topic']]); // If we can't see it, we should not merge it and not adjust counts! Instead skip it.
1078 1078
 			continue;
1079
-		}elseif (!$row['approved'])
1079
+		}
1080
+		elseif (!$row['approved'])
1080 1081
 			$boardTotals[$row['id_board']]['unapproved_topics']++;
1081 1082
 		else
1082 1083
 			$boardTotals[$row['id_board']]['topics']++;
Please login to merge, or discard this patch.