Completed
Push — release-2.1 ( 967873...229f76 )
by Mathias
09:51
created
Sources/ScheduledTasks.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -384,7 +384,7 @@
 block discarded – undo
384 384
 	clean_cache();
385 385
 
386 386
 	// If warning decrement is enabled and we have people who have not had a new warning in 24 hours, lower their warning level.
387
-	list (, , $modSettings['warning_decrement']) = explode(',', $modSettings['warning_settings']);
387
+	list (,, $modSettings['warning_decrement']) = explode(',', $modSettings['warning_settings']);
388 388
 	if ($modSettings['warning_decrement'])
389 389
 	{
390 390
 		// Find every member who has a warning level...
Please login to merge, or discard this patch.
Sources/Profile-Modify.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -498,7 +498,7 @@
 block discarded – undo
498 498
 						log_error(sprintf($txt['smiley_set_dir_not_found'], $set_names[array_search($set, $context['smiley_sets'])]));
499 499
 
500 500
 						$context['smiley_sets'] = array_filter($context['smiley_sets'], function($v) use ($set)
501
-							{
501
+						{
502 502
 								return $v != $set;
503 503
 							});
504 504
 					}
Please login to merge, or discard this patch.
Sources/Subs-Post.php 1 patch
Braces   -1 removed lines patch added patch discarded remove patch
@@ -1254,7 +1254,6 @@
 block discarded – undo
1254 1254
 
1255 1255
 		return array($charset, $string, 'base64');
1256 1256
 	}
1257
-
1258 1257
 	else
1259 1258
 		return array($charset, $string, '7bit');
1260 1259
 }
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
@@ -1282,7 +1282,7 @@
 block discarded – undo
1282 1282
 	// File Upload.
1283 1283
 	if ($context['can_post_attachment'])
1284 1284
 	{
1285
-		$acceptedFiles = implode(',', array_map(function ($val) use ($smcFunc)
1285
+		$acceptedFiles = implode(',', array_map(function($val) use ($smcFunc)
1286 1286
 		{
1287 1287
 			return '.' . $smcFunc['htmltrim']($val);
1288 1288
 		}, explode(',', $context['allowed_extensions'])));
Please login to merge, or discard this patch.
Sources/Display.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -1629,14 +1629,14 @@  discard block
 block discarded – undo
1629 1629
 	$output['quickbuttons'] = array(
1630 1630
 		'quote' => array(
1631 1631
 			'label' => $txt['quote_action'],
1632
-			'href' => $scripturl.'?action=post;quote='.$output['id'].';topic='.$context['current_topic'], '.'.$context['start'].';last_msg='.$context['topic_last_message'],
1633
-			'javascript' => 'onclick="return oQuickReply.quote('.$output['id'].');"',
1632
+			'href' => $scripturl . '?action=post;quote=' . $output['id'] . ';topic=' . $context['current_topic'], '.' . $context['start'] . ';last_msg=' . $context['topic_last_message'],
1633
+			'javascript' => 'onclick="return oQuickReply.quote(' . $output['id'] . ');"',
1634 1634
 			'icon' => 'quote',
1635 1635
 			'show' => $context['can_quote']
1636 1636
 		),
1637 1637
 		'quote_selected' => array(
1638 1638
 			'label' => $txt['quote_selected_action'],
1639
-			'id' => 'quoteSelected_'. $output['id'],
1639
+			'id' => 'quoteSelected_' . $output['id'],
1640 1640
 			'href' => 'javascript:void(0)',
1641 1641
 			'custom' => 'style="display:none"',
1642 1642
 			'icon' => 'quote_selected',
@@ -1645,71 +1645,71 @@  discard block
 block discarded – undo
1645 1645
 		'quick_edit' => array(
1646 1646
 			'label' => $txt['quick_edit'],
1647 1647
 			'class' => 'quick_edit',
1648
-			'id' =>' modify_button_'. $output['id'],
1649
-			'custom' => 'onclick="oQuickModify.modifyMsg(\''.$output['id'].'\', \''.!empty($modSettings['toggle_subject']).'\')"',
1648
+			'id' =>' modify_button_' . $output['id'],
1649
+			'custom' => 'onclick="oQuickModify.modifyMsg(\'' . $output['id'] . '\', \'' . !empty($modSettings['toggle_subject']) . '\')"',
1650 1650
 			'icon' => 'quick_edit_button',
1651 1651
 			'show' => $output['can_modify']
1652 1652
 		),
1653 1653
 		'more' => array(
1654 1654
 			'modify' => array(
1655 1655
 				'label' => $txt['modify'],
1656
-				'href' => $scripturl.'?action=post;msg='.$output['id'].';topic='.$context['current_topic'].'.'.$context['start'],
1656
+				'href' => $scripturl . '?action=post;msg=' . $output['id'] . ';topic=' . $context['current_topic'] . '.' . $context['start'],
1657 1657
 				'icon' => 'modify_button',
1658 1658
 				'show' => $output['can_modify']
1659 1659
 			),
1660 1660
 			'remove_topic' => array(
1661 1661
 				'label' => $txt['remove_topic'],
1662
-				'href' => $scripturl.'?action=removetopic2;topic='.$context['current_topic'].'.'.$context['start'].';'.$context['session_var'].'='.$context['session_id'],
1663
-				'javascript' => 'data-confirm="'.$txt['are_sure_remove_topic'].'" class="you_sure"',
1662
+				'href' => $scripturl . '?action=removetopic2;topic=' . $context['current_topic'] . '.' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id'],
1663
+				'javascript' => 'data-confirm="' . $txt['are_sure_remove_topic'] . '" class="you_sure"',
1664 1664
 				'icon' => 'remove_button',
1665 1665
 				'show' => $context['can_delete'] && ($context['topic_first_message'] == $output['id'])
1666 1666
 			),
1667 1667
 			'remove' => array(
1668 1668
 				'label' => $txt['remove'],
1669
-				'href' => $scripturl.'?action=deletemsg;topic='.$context['current_topic'].'.'.$context['start'].';msg='.$output['id'].';'.$context['session_var'].'='.$context['session_id'],
1670
-				'javascript' => 'data-confirm="'.$txt['remove_message_question'].'" class="you_sure"',
1669
+				'href' => $scripturl . '?action=deletemsg;topic=' . $context['current_topic'] . '.' . $context['start'] . ';msg=' . $output['id'] . ';' . $context['session_var'] . '=' . $context['session_id'],
1670
+				'javascript' => 'data-confirm="' . $txt['remove_message_question'] . '" class="you_sure"',
1671 1671
 				'icon' => 'remove_button',
1672 1672
 				'show' => $output['can_remove'] && ($context['topic_first_message'] != $output['id'])
1673 1673
 			),
1674 1674
 			'split' => array(
1675 1675
 				'label' => $txt['split'],
1676
-				'href' => $scripturl.'?action=splittopics;topic='.$context['current_topic'].'.0;at='.$output['id'],
1676
+				'href' => $scripturl . '?action=splittopics;topic=' . $context['current_topic'] . '.0;at=' . $output['id'],
1677 1677
 				'icon' => 'split_button',
1678 1678
 				'show' => $context['can_split'] && !empty($context['real_num_replies'])
1679 1679
 			),
1680 1680
 			'report' => array(
1681 1681
 				'label' => $txt['report_to_mod'],
1682
-				'href' => $scripturl.'?action=reporttm;topic='.$context['current_topic'].'.'.$output['counter'].';msg='.$output['id'],
1682
+				'href' => $scripturl . '?action=reporttm;topic=' . $context['current_topic'] . '.' . $output['counter'] . ';msg=' . $output['id'],
1683 1683
 				'icon' => 'error',
1684 1684
 				'show' => $context['can_report_moderator']
1685 1685
 			),
1686 1686
 			'warn' => array(
1687 1687
 				'label' => $txt['issue_warning'],
1688
-				'href' => $scripturl, '?action=profile;area=issuewarning;u='.$output['member']['id'].';msg='.$output['id'],
1688
+				'href' => $scripturl, '?action=profile;area=issuewarning;u=' . $output['member']['id'] . ';msg=' . $output['id'],
1689 1689
 				'icon' => 'warn_button',
1690 1690
 				'show' => $context['can_issue_warning'] && !$output['is_message_author'] && !$output['member']['is_guest']
1691 1691
 			),
1692 1692
 			'restore' => array(
1693 1693
 				'label' => $txt['restore_message'],
1694
-				'href' => $scripturl.'?action=restoretopic;msgs='.$output['id'].';'.$context['session_var'].'='.$context['session_id'],
1694
+				'href' => $scripturl . '?action=restoretopic;msgs=' . $output['id'] . ';' . $context['session_var'] . '=' . $context['session_id'],
1695 1695
 				'icon' => 'restore_button',
1696 1696
 				'show' => $context['can_restore_msg']
1697 1697
 			),
1698 1698
 			'approve' => array(
1699 1699
 				'label' => $txt['approve'],
1700
-				'href' => $scripturl.'?action=moderate;area=postmod;sa=approve;topic='.$context['current_topic'].'.'.$context['start'].';msg='.$output['id'].';'.$context['session_var'].'='.$context['session_id'],
1700
+				'href' => $scripturl . '?action=moderate;area=postmod;sa=approve;topic=' . $context['current_topic'] . '.' . $context['start'] . ';msg=' . $output['id'] . ';' . $context['session_var'] . '=' . $context['session_id'],
1701 1701
 				'icon' => 'approve_button',
1702 1702
 				'show' => $output['can_approve']
1703 1703
 			),
1704 1704
 			'unapprove' => array(
1705 1705
 				'label' => $txt['unapprove'],
1706
-				'href' => $scripturl.'?action=moderate;area=postmod;sa=approve;topic='.$context['current_topic'].'.'.$context['start'].';msg='.$output['id'].';'.$context['session_var'].'='.$context['session_id'],
1706
+				'href' => $scripturl . '?action=moderate;area=postmod;sa=approve;topic=' . $context['current_topic'] . '.' . $context['start'] . ';msg=' . $output['id'] . ';' . $context['session_var'] . '=' . $context['session_id'],
1707 1707
 				'icon' => 'unapprove_button',
1708 1708
 				'show' => $output['can_unapprove']
1709 1709
 			),
1710 1710
 		),
1711 1711
 		'quickmod' => array(
1712
-			'id' => 'in_topic_mod_check_'. $output['id'],
1712
+			'id' => 'in_topic_mod_check_' . $output['id'],
1713 1713
 			'custom' => 'style="display: none;"',
1714 1714
 			'content' => '',
1715 1715
 			'show' => !empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1 && $output['can_remove'],
Please login to merge, or discard this patch.