phpBB/adm/style/acp_groups.html

@@ -225,7 +225,6 @@
 
 	<fieldset>
 		<legend>{L_ADD_USERS}</legend>
-	{% EVENT acp_groups_add_user_options_before %}
 	<dl>
 		<dt><label for="leader">{L_USER_GROUP_LEADER}{L_COLON}</label></dt>
 		<dd><label><input name="leader" type="radio" class="radio" value="1" /> {L_YES}</label>
@@ -236,13 +235,11 @@
 		<dd><label><input name="default" type="radio" class="radio" value="1" /> {L_YES}</label>
 			<label><input name="default" type="radio" class="radio" id="default" value="0" checked="checked" /> {L_NO}</label></dd>
 	</dl>
-	{% EVENT acp_groups_add_user_usernames_before %}
 	<dl>
 		<dt><label for="usernames">{L_USERNAME}{L_COLON}</label><br /><span>{L_USERNAMES_EXPLAIN}</span></dt>
 		<dd><textarea id="usernames" name="usernames" cols="40" rows="5"></textarea></dd>
 		<dd><!-- EVENT acp_groups_find_username_prepend -->[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]<!-- EVENT acp_groups_find_username_append --></dd>
 	</dl>
-	{% EVENT acp_groups_add_user_options_after %}
 
 	<p class="quick">
 		<input class="button2" type="submit" name="addusers" value="{L_SUBMIT}" />

phpBB/adm/style/acp_main.html

@@ -14,31 +14,27 @@
 
 	<p>{L_ADMIN_INTRO}</p>
 
-	{% if S_UPDATE_INCOMPLETE %}
+	<!-- IF S_UPDATE_INCOMPLETE -->
 		<div class="errorbox">
-			<p>{{ lang('UPDATE_INCOMPLETE') }} <a href="{{ U_VERSIONCHECK }}">{{ lang('MORE_INFORMATION') }}</a></p>
+			<p>{L_UPDATE_INCOMPLETE} <a href="{U_VERSIONCHECK}">{L_MORE_INFORMATION}</a></p>
 		</div>
-	{% elseif S_VERSIONCHECK_FAIL %}
+	<!-- ELSEIF S_VERSIONCHECK_FAIL -->
 		<div class="errorbox notice">
-			<p>{{ lang('VERSIONCHECK_FAIL') }}</p>
+			<p>{L_VERSIONCHECK_FAIL}</p>
-			<p>{{ VERSIONCHECK_FAIL_REASON }}</p>
+			<p>{VERSIONCHECK_FAIL_REASON}</p>
-			<p><a href="{{ U_VERSIONCHECK_FORCE }}">{{ lang('VERSIONCHECK_FORCE_UPDATE') }}</a> &middot; <a href="{{ U_VERSIONCHECK }}">{{ lang('MORE_INFORMATION') }}</a></p>
+			<p><a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a> &middot; <a href="{U_VERSIONCHECK}">{L_MORE_INFORMATION}</a></p>
 		</div>
-	{% elseif not S_VERSION_UP_TO_DATE %}
+	<!-- ELSEIF not S_VERSION_UP_TO_DATE -->
 		<div class="errorbox">
-			<p>{{ lang('VERSION_NOT_UP_TO_DATE_TITLE') }}</p>
+			<p>{L_VERSION_NOT_UP_TO_DATE_TITLE}</p>
-			<p><a href="{{ U_VERSIONCHECK_FORCE }}">{{ lang('VERSIONCHECK_FORCE_UPDATE') }}</a> &middot; <a href="{{ U_VERSIONCHECK }}">{{ lang('MORE_INFORMATION') }}</a></p>
+			<p><a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a> &middot; <a href="{U_VERSIONCHECK}">{L_MORE_INFORMATION}</a></p>
 		</div>
-	{% elseif S_VERSION_UP_TO_DATE && S_VERSIONCHECK_FORCE %}
+	<!-- ENDIF -->
-		<div class="successbox">
+	<!-- IF S_VERSION_UPGRADEABLE -->
-			<p>{{ lang('VERSION_UP_TO_DATE_ACP') }}</p>
-		</div>
-	{% endif %}
-	{% if S_VERSION_UPGRADEABLE %}
 		<div class="errorbox notice">
-			<p>{{ UPGRADE_INSTRUCTIONS }}</p>
+			<p>{UPGRADE_INSTRUCTIONS}</p>
 		</div>
-	{% endif %}
+	<!-- ENDIF -->
 
 	<!-- IF S_SEARCH_INDEX_MISSING -->
 		<div class="errorbox">

phpBB/docs/events.md

@@ -184,24 +184,6 @@ acp_group_types_prepend
 * Since: 3.2.9-RC1
 * Purpose: Add additional group type options to group settings (prepend the list)
 
-acp_groups_add_user_options_after
-===
-* Location: adm/style/acp_groups.html
-* Since: 3.3.13-RC1
-* Purpose: Add content after options for adding user to group in the ACP
-
-acp_groups_add_user_options_before
-===
-* Location: adm/style/acp_groups.html
-* Since: 3.3.13-RC1
-* Purpose: Add content before options for adding user to group in the ACP
-
-acp_groups_add_user_usernames_before
-===
-* Location: adm/style/acp_groups.html
-* Since: 3.3.13-RC1
-* Purpose: Add content before usernames option for adding user to group in the ACP
-
 acp_groups_find_username_append
 ===
 * Location: adm/style/acp_groups.html
@@ -2553,20 +2535,6 @@ ucp_friend_list_before
 * Since: 3.1.0-a4
 * Purpose: Add optional elements before list of friends in UCP
 
-ucp_group_settings_after
-===
-* Locations:
-    + styles/prosilver/template/ucp_groups_manage.html
-* Since: 3.3.13-RC1
-* Purpose: Add content after options for managing a group in the UCP
-
-ucp_group_settings_before
-===
-* Locations:
-    + styles/prosilver/template/ucp_groups_manage.html
-* Since: 3.3.13-RC1
-* Purpose: Add content before options for managing a group in the UCP
-
 ucp_header_content_before
 ===
 * Locations:

phpBB/includes/acp/acp_main.php

@@ -454,7 +454,6 @@ class acp_main
 				$template->assign_vars(array(
 					'S_VERSION_UP_TO_DATE'		=> empty($updates_available),
 					'S_VERSION_UPGRADEABLE'		=> !empty($upgrades_available),
-					'S_VERSIONCHECK_FORCE'		=> (bool) $recheck,
 					'UPGRADE_INSTRUCTIONS'		=> !empty($upgrades_available) ? $user->lang('UPGRADE_INSTRUCTIONS', $upgrades_available['current'], $upgrades_available['announcement']) : false,
 				));
 			}

phpBB/memberlist.php

@@ -941,19 +941,10 @@ switch ($mode)
 		}
 		else if ($topic_id)
 		{
-			// Generate the navlinks based on the selected topic
+			$sql = 'SELECT f.parent_id, f.forum_parents, f.left_id, f.right_id, f.forum_type, f.forum_name, f.forum_id, f.forum_desc, f.forum_desc_uid, f.forum_desc_bitfield, f.forum_desc_options, f.forum_options, t.topic_title
-			$navlinks_sql_array = [
+					FROM ' . FORUMS_TABLE . ' as f,
-				'SELECT'    => 'f.parent_id, f.forum_parents, f.left_id, f.right_id, f.forum_type, f.forum_name, 
+						' . TOPICS_TABLE . ' as t
-					f.forum_id, f.forum_desc, f.forum_desc_uid, f.forum_desc_bitfield, f.forum_desc_options, 
+					WHERE t.forum_id = f.forum_id';
-					f.forum_options, t.topic_title',
-				'FROM'      => [
-					FORUMS_TABLE  => 'f',
-					TOPICS_TABLE  => 't',
-				],
-				'WHERE'     => 't.forum_id = f.forum_id AND t.topic_id = ' . (int) $topic_id,
-			];
-
-			$sql = $db->sql_build_query('SELECT', $navlinks_sql_array);
 			$result = $db->sql_query($sql);
 			$topic_data = $db->sql_fetchrow($result);
 			$db->sql_freeresult($result);

phpBB/styles/prosilver/template/ucp_groups_manage.html

@@ -52,7 +52,6 @@
 	<h3>{L_GROUP_SETTINGS_SAVE}</h3>
 
 	<fieldset>
-	<!-- EVENT ucp_group_settings_before -->
 	<dl>
 		<dt><label for="group_colour">{L_GROUP_COLOR}{L_COLON}</label><br /><span>{L_GROUP_COLOR_EXPLAIN}</span></dt>
 		<dd>
@@ -66,7 +65,6 @@
 		<dt><label for="group_rank">{L_GROUP_RANK}{L_COLON}</label></dt>
 		<dd><select name="group_rank" id="group_rank">{S_RANK_OPTIONS}</select></dd>
 	</dl>
-	<!-- EVENT ucp_group_settings_after -->
 	</fieldset>
 
 	</div>