Completed
Pull Request — release-2.1 (#4375)
by Colin
08:21
created
Themes/default/Post.template.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -417,8 +417,8 @@  discard block
 block discarded – undo
417 417
 									</div><!-- .attached_BBC -->
418 418
 									<div class="progressBar" role="progressBar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0"><span></span></div>
419 419
 									<div class="attach-ui">
420
-										<a data-dz-remove class="button cancel">', $txt['modify_cancel'] ,'</a>
421
-										<a class="button upload">', $txt['upload'] ,'</a>
420
+										<a data-dz-remove class="button cancel">', $txt['modify_cancel'], '</a>
421
+										<a class="button upload">', $txt['upload'], '</a>
422 422
 									</div>
423 423
 								</div><!-- .attach-info -->
424 424
 							</div><!-- #au-template -->
@@ -433,10 +433,10 @@  discard block
 block discarded – undo
433 433
 							</dt>
434 434
 							<dd class="smalltext fallback">
435 435
 								<div id="attachUpload" class="descbox">
436
-									<h5>', $txt['attach_drop_zone'] ,'</h5>
437
-									<a class="button" id="attach-cancelAll">', $txt['attached_cancelAll'] ,'</a>
438
-									<a class="button" id="attach-uploadAll">', $txt['attached_uploadAll'] ,'</a>
439
-									<a class="button fileinput-button">', $txt['attach_add'] ,'</a>
436
+									<h5>', $txt['attach_drop_zone'], '</h5>
437
+									<a class="button" id="attach-cancelAll">', $txt['attached_cancelAll'], '</a>
438
+									<a class="button" id="attach-uploadAll">', $txt['attached_uploadAll'], '</a>
439
+									<a class="button fileinput-button">', $txt['attach_add'], '</a>
440 440
 									<div id="total-progress" class="progressBar" role="progressBar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0"><span></span></div>
441 441
 									<div class="fallback">
442 442
 										<input type="file" multiple="multiple" name="attachment[]" id="attachment1" class="fallback"> (<a href="javascript:void(0);" onclick="cleanFileInput(\'attachment1\');">', $txt['clean_attach'], '</a>)
@@ -541,7 +541,7 @@  discard block
 block discarded – undo
541 541
 	// Option to delete an event if user is editing one.
542 542
 	if ($context['make_event'] && !$context['event']['new'])
543 543
 		echo '
544
-						<input type="submit" name="deleteevent" value="', $txt['event_delete'], '" data-confirm="', $txt['event_delete_confirm'] ,'" class="button you_sure">';
544
+						<input type="submit" name="deleteevent" value="', $txt['event_delete'], '" data-confirm="', $txt['event_delete_confirm'], '" class="button you_sure">';
545 545
 
546 546
 	echo '
547 547
 					</span>
@@ -795,7 +795,7 @@  discard block
 block discarded – undo
795 795
 			});';
796 796
 
797 797
 	echo '
798
-			var oEditorID = "', $context['post_box_name'] ,'";
798
+			var oEditorID = "', $context['post_box_name'], '";
799 799
 			var oEditorObject = oEditorHandle_', $context['post_box_name'], ';
800 800
 		</script>';
801 801
 
@@ -827,7 +827,7 @@  discard block
 block discarded – undo
827 827
 			if ($context['can_quote'])
828 828
 				echo '
829 829
 					<ul class="quickbuttons" id="msg_', $post['id'], '_quote">
830
-						<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>
830
+						<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>
831 831
 						<li id="post_modify"><a href="#postmodify" onclick="return insertQuoteFast(', $post['id'], ');"><span class="generic_icons quote"></span>', $txt['quote'], '</a></li>
832 832
 					</ul>';
833 833
 
@@ -911,7 +911,7 @@  discard block
 block discarded – undo
911 911
 	<head>
912 912
 		<meta charset="', $context['character_set'], '">
913 913
 		<title>', $txt['spell_check'], '</title>
914
-		<link rel="stylesheet" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $modSettings['browser_cache'] ,'">
914
+		<link rel="stylesheet" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $modSettings['browser_cache'], '">
915 915
 		<style>
916 916
 			body, td {
917 917
 				font-size: small;
@@ -941,8 +941,8 @@  discard block
 block discarded – undo
941 941
 			var spell_formname = window.opener.spell_formname;
942 942
 			var spell_fieldname = window.opener.spell_fieldname;
943 943
 		</script>
944
-		<script src="', $settings['default_theme_url'], '/scripts/spellcheck.js', $modSettings['browser_cache'] ,'"></script>
945
-		<script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'] ,'"></script>
944
+		<script src="', $settings['default_theme_url'], '/scripts/spellcheck.js', $modSettings['browser_cache'], '"></script>
945
+		<script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'], '"></script>
946 946
 		<script>
947 947
 			', $context['spell_js'], '
948 948
 		</script>
@@ -986,7 +986,7 @@  discard block
 block discarded – undo
986 986
 	<head>
987 987
 		<meta charset="', $context['character_set'], '">
988 988
 		<title>', $txt['retrieving_quote'], '</title>
989
-		<script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'] ,'"></script>
989
+		<script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'], '"></script>
990 990
 	</head>
991 991
 	<body>
992 992
 		', $txt['retrieving_quote'], '
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
@@ -231,7 +231,7 @@  discard block
 block discarded – undo
231 231
 
232 232
 				foreach ($message['custom_fields']['above_member'] as $custom)
233 233
 					echo '
234
-							<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
234
+							<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
235 235
 
236 236
 				echo '
237 237
 						</ul>
@@ -266,7 +266,7 @@  discard block
 block discarded – undo
266 266
 			if (!empty($message['custom_fields']['below_avatar']))
267 267
 				foreach ($message['custom_fields']['below_avatar'] as $custom)
268 268
 					echo '
269
-						<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
269
+						<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
270 270
 
271 271
 			if (!$message['member']['is_guest'])
272 272
 				echo '
@@ -308,7 +308,7 @@  discard block
 block discarded – undo
308 308
 
309 309
 					foreach ($message['custom_fields']['icons'] as $custom)
310 310
 						echo '
311
-								<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
311
+								<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
312 312
 
313 313
 					echo '
314 314
 							</ol>
@@ -372,7 +372,7 @@  discard block
 block discarded – undo
372 372
 				if (!empty($message['custom_fields']['standard']))
373 373
 					foreach ($message['custom_fields']['standard'] as $custom)
374 374
 						echo '
375
-						<li class="custom ', $custom['col_name'] ,'">', $custom['title'], ': ', $custom['value'], '</li>';
375
+						<li class="custom ', $custom['col_name'], '">', $custom['title'], ': ', $custom['value'], '</li>';
376 376
 
377 377
 				// Are we showing the warning status?
378 378
 				if ($message['member']['can_see_warning'])
@@ -383,7 +383,7 @@  discard block
 block discarded – undo
383 383
 				if (!empty($message['custom_fields']['bottom_poster']))
384 384
 					foreach ($message['custom_fields']['bottom_poster'] as $custom)
385 385
 						echo '
386
-						<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
386
+						<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
387 387
 			}
388 388
 
389 389
 			// Done with the information about the poster... on to the post itself.
@@ -484,7 +484,7 @@  discard block
 block discarded – undo
484 484
 
485 485
 				foreach ($message['custom_fields']['above_signature'] as $custom)
486 486
 					echo '
487
-								<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
487
+								<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
488 488
 
489 489
 				echo '
490 490
 							</ul>
@@ -507,7 +507,7 @@  discard block
 block discarded – undo
507 507
 
508 508
 				foreach ($message['custom_fields']['below_signature'] as $custom)
509 509
 					echo '
510
-								<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
510
+								<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
511 511
 
512 512
 				echo '
513 513
 							</ul>
@@ -643,7 +643,7 @@  discard block
 block discarded – undo
643 643
 	while ($message = $context['get_pmessage']('subject'))
644 644
 	{
645 645
 		echo '
646
-			<tr class="windowbg', $message['is_unread'] ? ' unread_pm' : '','">
646
+			<tr class="windowbg', $message['is_unread'] ? ' unread_pm' : '', '">
647 647
 				<td class="table_icon">
648 648
 					<script>
649 649
 						currentLabels[', $message['id'], '] = {';
@@ -922,13 +922,13 @@  discard block
 block discarded – undo
922 922
 				// You can only reply if they are not a guest...
923 923
 				if (!$message['member']['is_guest'])
924 924
 					echo '
925
-					<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'], '
926
-					<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'];
925
+					<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'], '
926
+					<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'];
927 927
 
928 928
 				// This is for "forwarding" - even if the member is gone.
929 929
 				else
930 930
 					echo '
931
-					<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'];
931
+					<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'];
932 932
 			}
933 933
 
934 934
 			echo '
@@ -1031,7 +1031,7 @@  discard block
 block discarded – undo
1031 1031
 				<div class="', empty($context['error_type']) || $context['error_type'] != 'serious' ? 'noticebox' : 'errorbox', '"', empty($context['post_error']['messages']) ? ' style="display: none"' : '', ' id="errors">
1032 1032
 					<dl>
1033 1033
 						<dt>
1034
-							<strong id="error_serious">', $txt['error_while_submitting'] , '</strong>
1034
+							<strong id="error_serious">', $txt['error_while_submitting'], '</strong>
1035 1035
 						</dt>
1036 1036
 						<dd class="error" id="error_list">
1037 1037
 							', empty($context['post_error']['messages']) ? '' : implode('<br>', $context['post_error']['messages']), '
@@ -1087,7 +1087,7 @@  discard block
 block discarded – undo
1087 1087
 						<span', (isset($context['post_error']['no_subject']) ? ' class="error"' : ''), ' id="caption_subject">', $txt['subject'], ':</span>
1088 1088
 					</dt>
1089 1089
 					<dd id="pm_subject">
1090
-						<input type="text" name="subject" value="', $context['subject'], '" tabindex="', $context['tabindex']++, '" size="80" maxlength="80"',isset($context['post_error']['no_subject']) ? ' class="error"' : '', '>
1090
+						<input type="text" name="subject" value="', $context['subject'], '" tabindex="', $context['tabindex']++, '" size="80" maxlength="80"', isset($context['post_error']['no_subject']) ? ' class="error"' : '', '>
1091 1091
 					</dd>
1092 1092
 				</dl>
1093 1093
 				<hr>';
@@ -1452,7 +1452,7 @@  discard block
 block discarded – undo
1452 1452
 		echo '
1453 1453
 		<div class="padding">
1454 1454
 			<input type="submit" name="save" value="', $txt['save'], '" class="button">
1455
-			<input type="submit" name="delete" value="', $txt['quickmod_delete_selected'], '" data-confirm="', $txt['pm_labels_delete'] ,'" class="button you_sure">
1455
+			<input type="submit" name="delete" value="', $txt['quickmod_delete_selected'], '" data-confirm="', $txt['pm_labels_delete'], '" class="button you_sure">
1456 1456
 		</div>';
1457 1457
 
1458 1458
 	echo '
@@ -1617,7 +1617,7 @@  discard block
 block discarded – undo
1617 1617
 	if (!empty($context['rules']))
1618 1618
 		echo '
1619 1619
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
1620
-			<input type="submit" name="delselected" value="', $txt['pm_delete_selected_rule'], '" data-confirm="', $txt['pm_js_delete_rule_confirm'] ,'" class="button smalltext you_sure">';
1620
+			<input type="submit" name="delselected" value="', $txt['pm_delete_selected_rule'], '" data-confirm="', $txt['pm_js_delete_rule_confirm'], '" class="button smalltext you_sure">';
1621 1621
 
1622 1622
 	echo '
1623 1623
 		</div>
@@ -1860,9 +1860,9 @@  discard block
 block discarded – undo
1860 1860
 
1861 1861
 		echo '
1862 1862
 				<select name="acttype[', $k, ']" id="acttype', $k, '" onchange="updateActionDef(', $k, '); rebuildRuleDesc();">
1863
-					<option value="">', $txt['pm_rule_sel_action'] , ':</option>
1864
-					<option value="lab"', $action['t'] == 'lab' ? ' selected' : '', '>', $txt['pm_rule_label'] , '</option>
1865
-					<option value="del"', $action['t'] == 'del' ? ' selected' : '', '>', $txt['pm_rule_delete'] , '</option>
1863
+					<option value="">', $txt['pm_rule_sel_action'], ':</option>
1864
+					<option value="lab"', $action['t'] == 'lab' ? ' selected' : '', '>', $txt['pm_rule_label'], '</option>
1865
+					<option value="del"', $action['t'] == 'del' ? ' selected' : '', '>', $txt['pm_rule_delete'], '</option>
1866 1866
 				</select>
1867 1867
 				<span id="labdiv', $k, '">
1868 1868
 					<select name="labdef[', $k, ']" id="labdef', $k, '" onchange="rebuildRuleDesc();">
@@ -1974,7 +1974,7 @@  discard block
 block discarded – undo
1974 1974
 			</div>
1975 1975
 			<ul class="quickbuttons">
1976 1976
 				<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>
1977
-				<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>
1977
+				<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>
1978 1978
 			</ul>
1979 1979
 		</div><!-- .windowbg -->';
1980 1980
 		}
Please login to merge, or discard this patch.