Merge fabef37d71 into 8f8a93fa71

phpBB/adm/style/installer_header.html

@@ -19,7 +19,7 @@
 		<form method="post" action="#" id="language_selector">
 			<fieldset class="nobg">
 				<label for="language">{L_SELECT_LANG}{L_COLON}</label>
-				<select id="language" name="language">
+				<select  id="language" name="language">
 					<!-- BEGIN language_select_item -->
 					<option value="{language_select_item.VALUE}"<!-- IF language_select_item.SELECTED --> selected="selected"<!-- ENDIF -->>{language_select_item.NAME}</option>
 					<!-- END language_select_item -->

phpBB/memberlist.php

@@ -1812,18 +1812,6 @@ switch ($mode)
 					$memberrow = array_merge($memberrow, $cp_row['row']);
 				}
 
-				/**
-				 * Modify the memberrow data before template variables are assigned.
-				 *
-				 * @event core.memberlist_modify_memberrow
-				 * @var int		user_id		The current user ID.
-				 * @var array	row			Array of raw user data.
-				 * @var array	memberrow	Array of member template variables.
-				 * @since 3.3.16-RC1
-				 */
-				$vars = ['user_id', 'row', 'memberrow'];
-				extract($phpbb_dispatcher->trigger_event('core.memberlist_modify_memberrow', compact($vars)));
-
 				$template->assign_block_vars('memberrow', $memberrow);
 
 				if (isset($cp_row['blockrow']) && count($cp_row['blockrow']))

phpBB/phpbb/install/controller/helper.php

@@ -339,14 +339,6 @@ class helper
 	protected function render_language_select($selected_language = null)
 	{
 		$langs = $this->lang_helper->get_available_languages();
-
-		// The first language will be selected by default. Unless a user has consciously included
-		// other languages in the installation process, it will be British English anyway.
-		if ($selected_language === null && count($langs))
-		{
-			$selected_language = $langs[0]['iso'];
-		}
-
 		foreach ($langs as $lang)
 		{
 			$this->template->assign_block_vars('language_select_item', array(

phpBB/phpbb/language/language_file_helper.php

@@ -67,20 +67,6 @@ class language_file_helper
 			);
 		}
 
-		usort($available_languages, [$this, 'sort_by_local_name']);
-
 		return $available_languages;
 	}
-
-	/**
-	 * Sorts the languages by their name instead of iso code
-	 *
-	 * @param mixed $a First language data
-	 * @param mixed $b Second language data
-	 * @return int
-	 */
-	private static function sort_by_local_name($a, $b): int
-	{
-		return $a['local_name'] <=> $b['local_name'];
-	}
 }

phpBB/phpbb/template/twig/twig.php

@@ -99,10 +99,7 @@ class twig extends \phpbb\template\base
 
 		foreach ($extensions as $extension)
 		{
-			if (!$this->twig->hasExtension(get_class($extension)))
-			{
-				$this->twig->addExtension($extension);
-			}
+			$this->twig->addExtension($extension);
 		}
 
 		// Add admin namespace

phpBB/styles/all/template/cron.html

@@ -4,4 +4,4 @@
 	to hide visually and `aria-hidden="true"` to hide from screen-readers; using
 	`hidden` or `display: none` would prevent the task from running.
 #}
-<img class="sr-only" aria-hidden="true" src="{{ CRON_TASK_URL|e('html_attr') }}" width="1" height="1" alt="">
+<img class="sr-only" aria-hidden="true" src="{{ CRON_TASK_URL|e('url') }}" width="1" height="1" alt="">

tests/cron/wrapper_test.php

@@ -67,7 +67,7 @@ class phpbb_cron_wrapper_test extends phpbb_template_template_test_case
 			$this->template
 		);
 
-		$this->assertEquals('<img class="sr-only" aria-hidden="true" src="app.php&#x2F;cron&#x2F;foo&#x3F;f&#x3D;5" width="1" height="1" alt="">', str_replace(["\n", "\t"], '', $this->wrapper->get_html_tag()));
+		$this->assertEquals('<img class="sr-only" aria-hidden="true" src="app.php%2Fcron%2Ffoo%3Ff%3D5" width="1" height="1" alt="">', str_replace(["\n", "\t"], '', $this->wrapper->get_html_tag()));
 	}
 
 	public function test_is_parametrized_false()