Completed
Push — release-2.1 ( dc1632...c939ca )
by Mert
16s
created
Themes/default/Post.template.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -422,8 +422,8 @@  discard block
 block discarded – undo
422 422
 									</div><!-- .attached_BBC -->
423 423
 									<div class="progressBar" role="progressBar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0"><span></span></div>
424 424
 									<div class="attach-ui">
425
-										<a data-dz-remove class="button cancel">', $txt['modify_cancel'] ,'</a>
426
-										<a class="button upload">', $txt['upload'] ,'</a>
425
+										<a data-dz-remove class="button cancel">', $txt['modify_cancel'], '</a>
426
+										<a class="button upload">', $txt['upload'], '</a>
427 427
 									</div>
428 428
 								</div><!-- .attach-info -->
429 429
 							</div><!-- #au-template -->
@@ -441,10 +441,10 @@  discard block
 block discarded – undo
441 441
 							</dt>
442 442
 							<dd class="smalltext fallback">
443 443
 								<div id="attachUpload" class="descbox">
444
-									<h5>', $txt['attach_drop_zone'] ,'</h5>
445
-									<a class="button" id="attach-cancelAll">', $txt['attached_cancelAll'] ,'</a>
446
-									<a class="button" id="attach-uploadAll">', $txt['attached_uploadAll'] ,'</a>
447
-									<a class="button fileinput-button">', $txt['attach_add'] ,'</a>
444
+									<h5>', $txt['attach_drop_zone'], '</h5>
445
+									<a class="button" id="attach-cancelAll">', $txt['attached_cancelAll'], '</a>
446
+									<a class="button" id="attach-uploadAll">', $txt['attached_uploadAll'], '</a>
447
+									<a class="button fileinput-button">', $txt['attach_add'], '</a>
448 448
 									<div id="total-progress" class="progressBar" role="progressBar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0"><span></span></div>
449 449
 									<div class="fallback">
450 450
 										<input type="file" multiple="multiple" name="attachment[]" id="attachment1" class="fallback"> (<a href="javascript:void(0);" onclick="cleanFileInput(\'attachment1\');">', $txt['clean_attach'], '</a>)
@@ -552,7 +552,7 @@  discard block
 block discarded – undo
552 552
 	// Option to delete an event if user is editing one.
553 553
 	if ($context['make_event'] && !$context['event']['new'])
554 554
 		echo '
555
-						<input type="submit" name="deleteevent" value="', $txt['event_delete'], '" data-confirm="', $txt['event_delete_confirm'] ,'" class="button you_sure">';
555
+						<input type="submit" name="deleteevent" value="', $txt['event_delete'], '" data-confirm="', $txt['event_delete_confirm'], '" class="button you_sure">';
556 556
 
557 557
 	echo '
558 558
 					</span>
@@ -806,7 +806,7 @@  discard block
 block discarded – undo
806 806
 			});';
807 807
 
808 808
 	echo '
809
-			var oEditorID = "', $context['post_box_name'] ,'";
809
+			var oEditorID = "', $context['post_box_name'], '";
810 810
 			var oEditorObject = oEditorHandle_', $context['post_box_name'], ';
811 811
 		</script>';
812 812
 
@@ -838,7 +838,7 @@  discard block
 block discarded – undo
838 838
 			{
839 839
 				echo '
840 840
 					<ul class="quickbuttons" id="msg_', $post['id'], '_quote">
841
-						<li style="display:none;" id="quoteSelected_', $post['id'], '" data-msgid="', $post['id'], '"><a href="javascript:void(0)"><span class="generic_icons quote_selected"></span>', $txt['quote_selected_action'] ,'</a></li>
841
+						<li style="display:none;" id="quoteSelected_', $post['id'], '" data-msgid="', $post['id'], '"><a href="javascript:void(0)"><span class="generic_icons quote_selected"></span>', $txt['quote_selected_action'], '</a></li>
842 842
 						<li id="post_modify"><a href="#postmodify" onclick="return insertQuoteFast(', $post['id'], ');"><span class="generic_icons quote"></span>', $txt['quote'], '</a></li>
843 843
 					</ul>';
844 844
 			}
@@ -925,7 +925,7 @@  discard block
 block discarded – undo
925 925
 	<head>
926 926
 		<meta charset="', $context['character_set'], '">
927 927
 		<title>', $txt['spell_check'], '</title>
928
-		<link rel="stylesheet" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $modSettings['browser_cache'] ,'">
928
+		<link rel="stylesheet" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $modSettings['browser_cache'], '">
929 929
 		<style>
930 930
 			body, td {
931 931
 				font-size: small;
@@ -955,8 +955,8 @@  discard block
 block discarded – undo
955 955
 			var spell_formname = window.opener.spell_formname;
956 956
 			var spell_fieldname = window.opener.spell_fieldname;
957 957
 		</script>
958
-		<script src="', $settings['default_theme_url'], '/scripts/spellcheck.js', $modSettings['browser_cache'] ,'"></script>
959
-		<script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'] ,'"></script>
958
+		<script src="', $settings['default_theme_url'], '/scripts/spellcheck.js', $modSettings['browser_cache'], '"></script>
959
+		<script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'], '"></script>
960 960
 		<script>
961 961
 			', $context['spell_js'], '
962 962
 		</script>
@@ -1000,7 +1000,7 @@  discard block
 block discarded – undo
1000 1000
 	<head>
1001 1001
 		<meta charset="', $context['character_set'], '">
1002 1002
 		<title>', $txt['retrieving_quote'], '</title>
1003
-		<script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'] ,'"></script>
1003
+		<script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'], '"></script>
1004 1004
 	</head>
1005 1005
 	<body>
1006 1006
 		', $txt['retrieving_quote'], '
Please login to merge, or discard this patch.
Themes/default/index.template.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -232,7 +232,7 @@
 block discarded – undo
232 232
 			// In maintenance mode, only login is allowed and don't show OverlayDiv
233 233
 			echo '
234 234
 			<ul class="floatleft welcome">
235
-				<li>', sprintf($txt['welcome_guest'], $txt['guest_title'], '', $scripturl. '?action=login', 'return true;'), '</li>
235
+				<li>', sprintf($txt['welcome_guest'], $txt['guest_title'], '', $scripturl . '?action=login', 'return true;'), '</li>
236 236
 			</ul>';
237 237
 
238 238
 	if (!empty($modSettings['userLanguage']) && !empty($context['languages']) && count($context['languages']) > 1)
Please login to merge, or discard this patch.
Themes/default/Admin.template.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -945,7 +945,7 @@
 block discarded – undo
945 945
 				}
946 946
 
947 947
 				echo isset($config_var['postinput']) ? '
948
-											' . $config_var['postinput'] : '','
948
+											' . $config_var['postinput'] : '', '
949 949
 									</dd>';
950 950
 			}
951 951
 		}
Please login to merge, or discard this patch.
Themes/default/PersonalMessage.template.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -232,7 +232,7 @@  discard block
 block discarded – undo
232 232
 
233 233
 				foreach ($message['custom_fields']['above_member'] as $custom)
234 234
 					echo '
235
-							<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
235
+							<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
236 236
 
237 237
 				echo '
238 238
 						</ul>
@@ -269,7 +269,7 @@  discard block
 block discarded – undo
269 269
 			if (!empty($message['custom_fields']['below_avatar']))
270 270
 				foreach ($message['custom_fields']['below_avatar'] as $custom)
271 271
 					echo '
272
-						<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
272
+						<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
273 273
 
274 274
 			if (!$message['member']['is_guest'])
275 275
 				echo '
@@ -311,7 +311,7 @@  discard block
 block discarded – undo
311 311
 
312 312
 					foreach ($message['custom_fields']['icons'] as $custom)
313 313
 						echo '
314
-								<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
314
+								<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
315 315
 
316 316
 					echo '
317 317
 							</ol>
@@ -369,7 +369,7 @@  discard block
 block discarded – undo
369 369
 				if (!empty($message['custom_fields']['standard']))
370 370
 					foreach ($message['custom_fields']['standard'] as $custom)
371 371
 						echo '
372
-						<li class="custom ', $custom['col_name'] ,'">', $custom['title'], ': ', $custom['value'], '</li>';
372
+						<li class="custom ', $custom['col_name'], '">', $custom['title'], ': ', $custom['value'], '</li>';
373 373
 
374 374
 				// Are we showing the warning status?
375 375
 				if ($message['member']['can_see_warning'])
@@ -380,7 +380,7 @@  discard block
 block discarded – undo
380 380
 				if (!empty($message['custom_fields']['bottom_poster']))
381 381
 					foreach ($message['custom_fields']['bottom_poster'] as $custom)
382 382
 						echo '
383
-						<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
383
+						<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
384 384
 			}
385 385
 
386 386
 			// Done with the information about the poster... on to the post itself.
@@ -481,7 +481,7 @@  discard block
 block discarded – undo
481 481
 
482 482
 				foreach ($message['custom_fields']['above_signature'] as $custom)
483 483
 					echo '
484
-								<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
484
+								<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
485 485
 
486 486
 				echo '
487 487
 							</ul>
@@ -502,7 +502,7 @@  discard block
 block discarded – undo
502 502
 
503 503
 				foreach ($message['custom_fields']['below_signature'] as $custom)
504 504
 					echo '
505
-								<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
505
+								<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
506 506
 
507 507
 				echo '
508 508
 							</ul>
@@ -641,7 +641,7 @@  discard block
 block discarded – undo
641 641
 	while ($message = $context['get_pmessage']('subject'))
642 642
 	{
643 643
 		echo '
644
-			<tr class="windowbg', $message['is_unread'] ? ' unread_pm' : '','">
644
+			<tr class="windowbg', $message['is_unread'] ? ' unread_pm' : '', '">
645 645
 				<td class="table_icon">
646 646
 					<script>
647 647
 						currentLabels[', $message['id'], '] = {';
@@ -926,13 +926,13 @@  discard block
 block discarded – undo
926 926
 				// You can only reply if they are not a guest...
927 927
 				if (!$message['member']['is_guest'])
928 928
 					echo '
929
-					<a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';quote;u=', $context['folder'] == 'sent' ? '' : $message['member']['id'], '">', $quote_button , '</a>', $context['menu_separator'], '
930
-					<a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';u=', $message['member']['id'], '">', $reply_button , '</a> ', $context['menu_separator'];
929
+					<a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';quote;u=', $context['folder'] == 'sent' ? '' : $message['member']['id'], '">', $quote_button, '</a>', $context['menu_separator'], '
930
+					<a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';u=', $message['member']['id'], '">', $reply_button, '</a> ', $context['menu_separator'];
931 931
 
932 932
 				// This is for "forwarding" - even if the member is gone.
933 933
 				else
934 934
 					echo '
935
-					<a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';quote">', $quote_button , '</a>', $context['menu_separator'];
935
+					<a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';quote">', $quote_button, '</a>', $context['menu_separator'];
936 936
 			}
937 937
 
938 938
 			echo '
@@ -1037,7 +1037,7 @@  discard block
 block discarded – undo
1037 1037
 				<div class="', empty($context['error_type']) || $context['error_type'] != 'serious' ? 'noticebox' : 'errorbox', '"', empty($context['post_error']['messages']) ? ' style="display: none"' : '', ' id="errors">
1038 1038
 					<dl>
1039 1039
 						<dt>
1040
-							<strong id="error_serious">', $txt['error_while_submitting'] , '</strong>
1040
+							<strong id="error_serious">', $txt['error_while_submitting'], '</strong>
1041 1041
 						</dt>
1042 1042
 						<dd class="error" id="error_list">
1043 1043
 							', empty($context['post_error']['messages']) ? '' : implode('<br>', $context['post_error']['messages']), '
@@ -1093,7 +1093,7 @@  discard block
 block discarded – undo
1093 1093
 						<span', (isset($context['post_error']['no_subject']) ? ' class="error"' : ''), ' id="caption_subject">', $txt['subject'], ':</span>
1094 1094
 					</dt>
1095 1095
 					<dd id="pm_subject">
1096
-						<input type="text" name="subject" value="', $context['subject'], '" tabindex="', $context['tabindex']++, '" size="80" maxlength="80"',isset($context['post_error']['no_subject']) ? ' class="error"' : '', '/>
1096
+						<input type="text" name="subject" value="', $context['subject'], '" tabindex="', $context['tabindex']++, '" size="80" maxlength="80"', isset($context['post_error']['no_subject']) ? ' class="error"' : '', '/>
1097 1097
 					</dd>
1098 1098
 				</dl>
1099 1099
 				<hr>';
@@ -1462,7 +1462,7 @@  discard block
 block discarded – undo
1462 1462
 		echo '
1463 1463
 		<div class="padding">
1464 1464
 			<input type="submit" name="save" value="', $txt['save'], '" class="button">
1465
-			<input type="submit" name="delete" value="', $txt['quickmod_delete_selected'], '" data-confirm="', $txt['pm_labels_delete'] ,'" class="button you_sure">
1465
+			<input type="submit" name="delete" value="', $txt['quickmod_delete_selected'], '" data-confirm="', $txt['pm_labels_delete'], '" class="button you_sure">
1466 1466
 		</div>';
1467 1467
 
1468 1468
 	echo '
@@ -1627,7 +1627,7 @@  discard block
 block discarded – undo
1627 1627
 	if (!empty($context['rules']))
1628 1628
 		echo '
1629 1629
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
1630
-			<input type="submit" name="delselected" value="', $txt['pm_delete_selected_rule'], '" data-confirm="', $txt['pm_js_delete_rule_confirm'] ,'" class="button smalltext you_sure">';
1630
+			<input type="submit" name="delselected" value="', $txt['pm_delete_selected_rule'], '" data-confirm="', $txt['pm_js_delete_rule_confirm'], '" class="button smalltext you_sure">';
1631 1631
 
1632 1632
 	echo '
1633 1633
 		</div>
@@ -1871,9 +1871,9 @@  discard block
 block discarded – undo
1871 1871
 
1872 1872
 		echo '
1873 1873
 				<select name="acttype[', $k, ']" id="acttype', $k, '" onchange="updateActionDef(', $k, '); rebuildRuleDesc();">
1874
-					<option value="">', $txt['pm_rule_sel_action'] , ':</option>
1875
-					<option value="lab"', $action['t'] == 'lab' ? ' selected' : '', '>', $txt['pm_rule_label'] , '</option>
1876
-					<option value="del"', $action['t'] == 'del' ? ' selected' : '', '>', $txt['pm_rule_delete'] , '</option>
1874
+					<option value="">', $txt['pm_rule_sel_action'], ':</option>
1875
+					<option value="lab"', $action['t'] == 'lab' ? ' selected' : '', '>', $txt['pm_rule_label'], '</option>
1876
+					<option value="del"', $action['t'] == 'del' ? ' selected' : '', '>', $txt['pm_rule_delete'], '</option>
1877 1877
 				</select>
1878 1878
 				<span id="labdiv', $k, '">
1879 1879
 					<select name="labdef[', $k, ']" id="labdef', $k, '" onchange="rebuildRuleDesc();">
@@ -1987,7 +1987,7 @@  discard block
 block discarded – undo
1987 1987
 			</div>
1988 1988
 			<ul class="quickbuttons">
1989 1989
 				<li><a href="', $scripturl, '?action=pm;sa=showpmdrafts;id_draft=', $draft['id_draft'], ';', $context['session_var'], '=', $context['session_id'], '"><span class="generic_icons modifybutton"></span>', $txt['draft_edit'], '</a></li>
1990
-				<li><a href="', $scripturl, '?action=pm;sa=showpmdrafts;delete=', $draft['id_draft'], ';', $context['session_var'], '=', $context['session_id'], '" data-confirm="', $txt['draft_remove'] ,'?" class="you_sure"><span class="generic_icons remove_button"></span>', $txt['draft_delete'], '</a></li>
1990
+				<li><a href="', $scripturl, '?action=pm;sa=showpmdrafts;delete=', $draft['id_draft'], ';', $context['session_var'], '=', $context['session_id'], '" data-confirm="', $txt['draft_remove'], '?" class="you_sure"><span class="generic_icons remove_button"></span>', $txt['draft_delete'], '</a></li>
1991 1991
 			</ul>
1992 1992
 		</div><!-- .windowbg -->';
1993 1993
 		}
Please login to merge, or discard this patch.
Themes/default/Profile.template.php 1 patch
Spacing   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -3078,8 +3078,7 @@
 block discarded – undo
3078 3078
 			<div class="roundframe">
3079 3079
 				<div>
3080 3080
 		', !empty($context['tfa_backup']) ? '
3081
-					<div class="smalltext error">' . $txt['tfa_backup_used_desc'] . '</div>' :
3082
-			($modSettings['tfa_mode'] == 2 ? '
3081
+					<div class="smalltext error">' . $txt['tfa_backup_used_desc'] . '</div>' : ($modSettings['tfa_mode'] == 2 ? '
3083 3082
 									<div class="smalltext"><strong>' . $txt['tfa_forced_desc'] . '</strong></div>' : ''), '
3084 3083
 									<div class="smalltext">', $txt['tfa_desc'], '</div>
3085 3084
 									<div class="floatleft">
Please login to merge, or discard this patch.