Completed
Branch release-2.1 (4c82a0)
by Rick
15:44
created
Themes/default/Reports.template.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
 				// Shaded?
112 112
 				if ($column_number == 0 && !empty($table['shading']['left']))
113 113
 					echo '
114
-					<td class="table_caption ', $table['align']['shaded'], 'text"', $table['width']['shaded'] != 'auto' ? ' width="' . $table['width'].'shaded'] . '"' : '', '>
114
+					<td class="table_caption ', $table['align']['shaded'], 'text"', $table['width']['shaded'] != 'auto' ? ' width="' . $table['width'] . 'shaded'] . '"' : '', '>
115 115
 						', $data['v'] == $table['default_value'] ? '' : ($data['v'] . (empty($data['v']) ? '' : ':')), '
116 116
 					</td>';
117 117
 				else
@@ -148,7 +148,7 @@  discard block
 block discarded – undo
148 148
 	<head>
149 149
 		<meta charset="', $context['character_set'], '">
150 150
 		<title>', $context['page_title'], '</title>
151
-		<link rel="stylesheet" href="', $settings['default_theme_url'], '/css/report.css', $modSettings['browser_cache'] ,'">
151
+		<link rel="stylesheet" href="', $settings['default_theme_url'], '/css/report.css', $modSettings['browser_cache'], '">
152 152
 	</head>
153 153
 	<body>';
154 154
 }
Please login to merge, or discard this patch.
Themes/default/Packages.template.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -916,7 +916,7 @@  discard block
 block discarded – undo
916 916
 				{
917 917
 					// 1. Some mod [ Download ].
918 918
 					echo '
919
-						<strong><span id="ps_img_', $i, '_pkg_', $id, '" class="toggle_up" alt="*" style="display: none;"></span> ', $package['can_install'] || !empty($package['can_emulate_install']) ? '<strong>' . $package['name'] . '</strong> <a href="' . $package['download']['href'] . '">[ ' . $txt['download'] . ' ]</a>': $package['name'], '</strong>
919
+						<strong><span id="ps_img_', $i, '_pkg_', $id, '" class="toggle_up" alt="*" style="display: none;"></span> ', $package['can_install'] || !empty($package['can_emulate_install']) ? '<strong>' . $package['name'] . '</strong> <a href="' . $package['download']['href'] . '">[ ' . $txt['download'] . ' ]</a>' : $package['name'], '</strong>
920 920
 						<ul id="package_section_', $i, '_pkg_', $id, '" class="package_section">';
921 921
 
922 922
 					// Show the mod type?
@@ -1289,10 +1289,10 @@  discard block
 block discarded – undo
1289 1289
 	<head>
1290 1290
 		<meta charset="', $context['character_set'], '">
1291 1291
 		<title>', $txt['operation_title'], '</title>
1292
-		<link rel="stylesheet" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $modSettings['browser_cache'] ,'">
1293
-		<link rel="stylesheet" href="', $settings['theme_url'], '/css/admin.css', $modSettings['browser_cache'] ,'">
1294
-		<script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'] ,'"></script>
1295
-		<script src="', $settings['default_theme_url'], '/scripts/theme.js', $modSettings['browser_cache'] ,'"></script>
1292
+		<link rel="stylesheet" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $modSettings['browser_cache'], '">
1293
+		<link rel="stylesheet" href="', $settings['theme_url'], '/css/admin.css', $modSettings['browser_cache'], '">
1294
+		<script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'], '"></script>
1295
+		<script src="', $settings['default_theme_url'], '/scripts/theme.js', $modSettings['browser_cache'], '"></script>
1296 1296
 	</head>
1297 1297
 	<body>
1298 1298
 		<div class="padding windowbg">
Please login to merge, or discard this patch.
Themes/default/Help.template.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -24,8 +24,8 @@  discard block
 block discarded – undo
24 24
 		<meta charset="', $context['character_set'], '">
25 25
 		<meta name="robots" content="noindex">
26 26
 		<title>', $context['page_title'], '</title>
27
-		<link rel="stylesheet" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $modSettings['browser_cache'] ,'">
28
-		<script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'] ,'"></script>
27
+		<link rel="stylesheet" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $modSettings['browser_cache'], '">
28
+		<script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'], '"></script>
29 29
 	</head>
30 30
 	<body id="help_popup">
31 31
 		<div class="windowbg description">
@@ -50,8 +50,8 @@  discard block
 block discarded – undo
50 50
 		<title>', $txt['find_members'], '</title>
51 51
 		<meta charset="', $context['character_set'], '">
52 52
 		<meta name="robots" content="noindex">
53
-		<link rel="stylesheet" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $modSettings['browser_cache'] ,'">
54
-		<script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'] ,'"></script>
53
+		<link rel="stylesheet" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $modSettings['browser_cache'], '">
54
+		<script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'], '"></script>
55 55
 		<script>
56 56
 			var membersAdded = [];
57 57
 			function addMember(name)
Please login to merge, or discard this patch.
Themes/default/ReportToMod.template.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -90,7 +90,7 @@
 block discarded – undo
90 90
 
91 91
 	echo '
92 92
 					</dl>
93
-					<input type="submit" name="preview" value="', $txt['preview'] , '" class="button_submit">
93
+					<input type="submit" name="preview" value="', $txt['preview'], '" class="button_submit">
94 94
 					<input type="submit" name="save" value="', $txt['rtm10'], '" style="margin-left: 1ex;" class="button_submit">
95 95
 					<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
96 96
 				</div>
Please login to merge, or discard this patch.
Themes/default/Recent.template.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
 	<div id="recent" class="main_section">
22 22
 		<div class="cat_bar">
23 23
 			<h3 class="catbg">
24
-				<span class="xx"></span>',$txt['recent_posts'],'
24
+				<span class="xx"></span>',$txt['recent_posts'], '
25 25
 			</h3>
26 26
 		</div>
27 27
 		<div class="pagesection">', $context['page_index'], '</div>';
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
 	foreach ($context['posts'] as $post)
36 36
 	{
37 37
 		echo '
38
-			<div class="', $post['css_class'] ,'">
38
+			<div class="', $post['css_class'], '">
39 39
 					<div class="counter">', $post['counter'], '</div>
40 40
 					<div class="topic_details">
41 41
 						<h5>', $post['board']['link'], ' / ', $post['link'], '</h5>
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
 		// How about... even... remove it entirely?!
61 61
 		if ($post['can_delete'])
62 62
 			echo '
63
-						<li><a href="', $scripturl, '?action=deletemsg;msg=', $post['id'], ';topic=', $post['topic'], ';recent;', $context['session_var'], '=', $context['session_id'], '" data-confirm="', $txt['remove_message'] ,'" class="you_sure"><span class="generic_icons remove_button"></span>', $txt['remove'], '</a></li>';
63
+						<li><a href="', $scripturl, '?action=deletemsg;msg=', $post['id'], ';topic=', $post['topic'], ';recent;', $context['session_var'], '=', $context['session_id'], '" data-confirm="', $txt['remove_message'], '" class="you_sure"><span class="generic_icons remove_button"></span>', $txt['remove'], '</a></li>';
64 64
 
65 65
 		if ($post['can_reply'] || $post['can_quote'] || $post['can_delete'])
66 66
 			echo '
@@ -274,7 +274,7 @@  discard block
 block discarded – undo
274 274
 						<div class="', $topic['css_class'], '">
275 275
 							<div class="board_icon">
276 276
 								<img src="', $topic['first_post']['icon_url'], '" alt="">
277
-								', $topic['is_posted_in'] ? '<img class="posted" src="' . $settings['images_url'] . '/icons/profile_sm.png" alt="">' : '','
277
+								', $topic['is_posted_in'] ? '<img class="posted" src="' . $settings['images_url'] . '/icons/profile_sm.png" alt="">' : '', '
278 278
 							</div>
279 279
 							<div class="info">';
280 280
 
Please login to merge, or discard this patch.
Themes/default/ModerationCenter.template.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -325,7 +325,7 @@  discard block
 block discarded – undo
325 325
 	{
326 326
 		echo '
327 327
 			<div class="infobox">
328
-				', $txt['report_action_'. $context['report_post_action']], '
328
+				', $txt['report_action_' . $context['report_post_action']], '
329 329
 			</div>';
330 330
 	}
331 331
 
@@ -346,7 +346,7 @@  discard block
 block discarded – undo
346 346
 			// Cycle through the notes.
347 347
 			foreach ($context['notes'] as $note)
348 348
 				echo '
349
-							<li class="smalltext">', ($note['can_delete'] ? '<a href="'. $note['delete_href'] .';'. $context['mod-modnote-del_token_var'] .'='. $context['mod-modnote-del_token'] .'" data-confirm="'. $txt['mc_reportedp_delete_confirm'] .'" class="you_sure"><span class="generic_icons delete"></span></a>' : ''), $note['time'] ,' <strong>', $note['author']['link'], ':</strong> ', $note['text'], '</li>';
349
+							<li class="smalltext">', ($note['can_delete'] ? '<a href="' . $note['delete_href'] . ';' . $context['mod-modnote-del_token_var'] . '=' . $context['mod-modnote-del_token'] . '" data-confirm="' . $txt['mc_reportedp_delete_confirm'] . '" class="you_sure"><span class="generic_icons delete"></span></a>' : ''), $note['time'], ' <strong>', $note['author']['link'], ':</strong> ', $note['text'], '</li>';
350 350
 
351 351
 			echo '
352 352
 						</ul>
@@ -479,7 +479,7 @@  discard block
 block discarded – undo
479 479
 
480 480
 	if ($post['can_delete'])
481 481
 		$output_html .= '
482
-							<a href="' . $scripturl . '?action=moderate;area=userwatch;sa=post;delete=' . $post['id'] . ';start=' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id'] . '" data-confirm="'. $txt['mc_watched_users_delete_post'] . '" class="you_sure">' . $delete_button . '</a>
482
+							<a href="' . $scripturl . '?action=moderate;area=userwatch;sa=post;delete=' . $post['id'] . ';start=' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id'] . '" data-confirm="' . $txt['mc_watched_users_delete_post'] . '" class="you_sure">' . $delete_button . '</a>
483 483
 							<input type="checkbox" name="delete[]" value="' . $post['id'] . '" class="input_check">';
484 484
 
485 485
 	$output_html .= '
@@ -546,7 +546,7 @@  discard block
 block discarded – undo
546 546
 	<head>
547 547
 		<meta charset="', $context['character_set'], '">
548 548
 		<title>', $context['page_title'], '</title>
549
-		<link rel="stylesheet" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $modSettings['browser_cache'] ,'">
549
+		<link rel="stylesheet" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $modSettings['browser_cache'], '">
550 550
 	</head>
551 551
 	<body>
552 552
 		<div class="cat_bar">
@@ -590,7 +590,7 @@  discard block
 block discarded – undo
590 590
 				<div class="errorbox"', empty($context['warning_errors']) ? ' style="display: none"' : '', ' id="errors">
591 591
 					<dl>
592 592
 						<dt>
593
-							<strong id="error_serious">', $txt['error_while_submitting'] , '</strong>
593
+							<strong id="error_serious">', $txt['error_while_submitting'], '</strong>
594 594
 						</dt>
595 595
 						<dd class="error" id="error_list">
596 596
 							', empty($context['warning_errors']) ? '' : implode('<br>', $context['warning_errors']), '
@@ -600,7 +600,7 @@  discard block
 block discarded – undo
600 600
 				<div id="box_preview"', !empty($context['template_preview']) ? '' : ' style="display:none"', '>
601 601
 					<dl class="settings">
602 602
 						<dt>
603
-							<strong>', $txt['preview'] , '</strong>
603
+							<strong>', $txt['preview'], '</strong>
604 604
 						</dt>
605 605
 						<dd id="template_preview">
606 606
 							', !empty($context['template_preview']) ? $context['template_preview'] : '', '
Please login to merge, or discard this patch.
Themes/default/languages/ManageSettings.english.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -339,7 +339,7 @@
 block discarded – undo
339 339
 		<li>Where a file already exists on your forum the &quot;Already Exists&quot; column will have one of two values. &quot;Identical&quot; indicates that the file already exists in an identical form and need not be overwritten. &quot;Different&quot; means that the contents vary in some way and overwriting is probably the optimum solution.</li>
340 340
 	</ul>';
341 341
 
342
-$txt['languages_download_main_files'] = 'Primary Files';+
342
+$txt['languages_download_main_files'] = 'Primary Files'; +
343 343
 $txt['languages_download_filename'] = 'File Name';
344 344
 $txt['languages_download_dest'] = 'Destination';
345 345
 $txt['languages_download_writable'] = 'Writable';
Please login to merge, or discard this patch.
Themes/default/Themes.template.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
 	echo '
25 25
 		<div class="cat_bar">
26 26
 		<h3 class="catbg">
27
-			<a href="', $scripturl, '?action=helpadmin;help=themes" onclick="return reqOverlayDiv(this.href);" class="help"><span class="generic_icons help" title="', $txt['help'],'"></span></a>
27
+			<a href="', $scripturl, '?action=helpadmin;help=themes" onclick="return reqOverlayDiv(this.href);" class="help"><span class="generic_icons help" title="', $txt['help'], '"></span></a>
28 28
 			', $txt['themeadmin_title'], '
29 29
 		</h3>
30 30
 		</div>
@@ -200,7 +200,7 @@  discard block
 block discarded – undo
200 200
 	if (isset($_GET['done']))
201 201
 		echo '
202 202
 	<div class="infobox">
203
-		', $txt['theme_confirmed_'. $_GET['done']] ,'
203
+		', $txt['theme_confirmed_' . $_GET['done']], '
204 204
 	</div>';
205 205
 
206 206
 	echo '
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
226 226
 			<div class="cat_bar">
227 227
 				<h3 class="catbg">
228 228
 					<span class="floatleft">
229
-						', (!empty($theme['enable']) || $theme['id'] == 1 ? '<a href="'. $scripturl .'?action=admin;area=theme;th='. $theme['id'] .';'. $context['session_var'] .'='. $context['session_id'] .';sa=list">'. $theme['name'] .'</a>' : $theme['name'] ),'', (!empty($theme['version']) ? ' <em>(' . $theme['version'] . ')</em>' : ''), '
229
+						', (!empty($theme['enable']) || $theme['id'] == 1 ? '<a href="' . $scripturl . '?action=admin;area=theme;th=' . $theme['id'] . ';' . $context['session_var'] . '=' . $context['session_id'] . ';sa=list">' . $theme['name'] . '</a>' : $theme['name']), '', (!empty($theme['version']) ? ' <em>(' . $theme['version'] . ')</em>' : ''), '
230 230
 					</span>';
231 231
 
232 232
 			// You *cannot* disable/enable/delete the default theme. It's important!
@@ -237,7 +237,7 @@  discard block
 block discarded – undo
237 237
 
238 238
 				// Enable/Disable.
239 239
 				echo '
240
-					<a href="', $scripturl, '?action=admin;area=theme;sa=enable;th=', $theme['id'], ';', $context['session_var'], '=', $context['session_id'], ';', $context['admin-tre_token_var'], '=', $context['admin-tre_token'], '', (!empty($theme['enable']) ? ';disabled' : '') ,'" data-confirm="', $txt['theme_'. (!empty($theme['enable']) ? 'disable' : 'enable') .'_confirm'], '" class="you_sure"><span class="generic_icons ',!empty($theme['enable']) ? 'disable' : 'enable','" title="', $txt['theme_'. (!empty($theme['enable']) ? 'disable' : 'enable')] ,'"></span></a>';
240
+					<a href="', $scripturl, '?action=admin;area=theme;sa=enable;th=', $theme['id'], ';', $context['session_var'], '=', $context['session_id'], ';', $context['admin-tre_token_var'], '=', $context['admin-tre_token'], '', (!empty($theme['enable']) ? ';disabled' : ''), '" data-confirm="', $txt['theme_' . (!empty($theme['enable']) ? 'disable' : 'enable') . '_confirm'], '" class="you_sure"><span class="generic_icons ', !empty($theme['enable']) ? 'disable' : 'enable', '" title="', $txt['theme_' . (!empty($theme['enable']) ? 'disable' : 'enable')], '"></span></a>';
241 241
 
242 242
 				// Deleting.
243 243
 				echo '
@@ -464,7 +464,7 @@  discard block
 block discarded – undo
464 464
 		<form action="', $scripturl, '?action=admin;area=theme;sa=list;th=', $context['theme_settings']['theme_id'], '" method="post" accept-charset="', $context['character_set'], '">
465 465
 			<div class="cat_bar">
466 466
 				<h3 class="catbg">
467
-					<a href="', $scripturl, '?action=helpadmin;help=theme_settings" onclick="return reqOverlayDiv(this.href);" class="help"><span class="generic_icons help" title="', $txt['help'],'"></span></a> ', $txt['theme_settings'], ' - ', $context['theme_settings']['name'], '
467
+					<a href="', $scripturl, '?action=helpadmin;help=theme_settings" onclick="return reqOverlayDiv(this.href);" class="help"><span class="generic_icons help" title="', $txt['help'], '"></span></a> ', $txt['theme_settings'], ' - ', $context['theme_settings']['name'], '
468 468
 				</h3>
469 469
 			</div>
470 470
 			<br>';
@@ -633,7 +633,7 @@  discard block
 block discarded – undo
633 633
 			echo '
634 634
 					</dt>
635 635
 					<dd>
636
-						<textarea rows="4" style="width: 95%;" cols="40" name="', !empty($setting['default']) ? 'default_' : '','options[', $setting['id'], ']" id="', $setting['id'], '">', $setting['value'], '</textarea>';
636
+						<textarea rows="4" style="width: 95%;" cols="40" name="', !empty($setting['default']) ? 'default_' : '', 'options[', $setting['id'], ']" id="', $setting['id'], '">', $setting['value'], '</textarea>';
637 637
                 echo '
638 638
                 			</dd>';
639 639
 		}
@@ -817,14 +817,14 @@  discard block
 block discarded – undo
817 817
 	if (!empty($context['error_message']))
818 818
 		echo '
819 819
 			<p>
820
-				', $context['error_message'] ,'
820
+				', $context['error_message'], '
821 821
 			</p>';
822 822
 
823 823
 	// Not much to show except a link back...
824 824
 	else
825 825
 		echo '
826 826
 			<p>
827
-				<a href="', $scripturl, '?action=admin;area=theme;sa=list;th=', $context['installed_theme']['id'], ';', $context['session_var'], '=', $context['session_id'], '">', $context['installed_theme']['name'], '</a> ', $txt['theme_'. (isset($context['installed_theme']['updated']) ? 'updated' : 'installed') .'_message'], '
827
+				<a href="', $scripturl, '?action=admin;area=theme;sa=list;th=', $context['installed_theme']['id'], ';', $context['session_var'], '=', $context['session_id'], '">', $context['installed_theme']['name'], '</a> ', $txt['theme_' . (isset($context['installed_theme']['updated']) ? 'updated' : 'installed') . '_message'], '
828 828
 			</p>
829 829
 			<p>
830 830
 				<a href="', $scripturl, '?action=admin;area=theme;sa=admin;', $context['session_var'], '=', $context['session_id'], '">', $txt['back'], '</a>
@@ -1165,7 +1165,7 @@  discard block
 block discarded – undo
1165 1165
 		echo '
1166 1166
 				<label for="on_line', $part['line'], '">', $txt['themeadmin_edit_on_line'], ' ', $part['line'], '</label>:<br>
1167 1167
 				<div class="centertext">
1168
-					<textarea id="on_line', $part['line'] ,'" name="entire_file[]" cols="80" rows="', $part['lines'] > 14 ? '14' : $part['lines'], '" class="edit_file">', $part['data'], '</textarea>
1168
+					<textarea id="on_line', $part['line'], '" name="entire_file[]" cols="80" rows="', $part['lines'] > 14 ? '14' : $part['lines'], '" class="edit_file">', $part['data'], '</textarea>
1169 1169
 				</div>';
1170 1170
 
1171 1171
 	echo '
Please login to merge, or discard this patch.
Themes/default/MoveTopic.template.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -39,7 +39,7 @@
 block discarded – undo
39 39
 
40 40
 		foreach ($category['boards'] as $board)
41 41
 			echo '
42
-									<option value="', $board['id'], '"', $board['selected'] ? ' selected' : '', $board['id'] == $context['current_board'] ? ' disabled' : '', '>', $board['child_level'] > 0 ? str_repeat('==', $board['child_level']-1) . '=&gt; ' : '', $board['name'], '</option>';
42
+									<option value="', $board['id'], '"', $board['selected'] ? ' selected' : '', $board['id'] == $context['current_board'] ? ' disabled' : '', '>', $board['child_level'] > 0 ? str_repeat('==', $board['child_level'] - 1) . '=&gt; ' : '', $board['name'], '</option>';
43 43
 		echo '
44 44
 								</optgroup>';
45 45
 	}
Please login to merge, or discard this patch.