Merge b6c42b3768 into 2f43c1facd

PHPBB-17399

phpBB/memberlist.php

@@ -1812,6 +1812,18 @@ switch ($mode)
 					$memberrow = array_merge($memberrow, $cp_row['row']);
 				}
 
+				/**
+				 * Modify the memberrow data before template variables are assigned.
+				 *
+				 * @event core.memberlist_memberrow_template_vars_before
+				 * @var integer	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_memberrow_template_vars_before', compact($vars)));
+
 				$template->assign_block_vars('memberrow', $memberrow);
 
 				if (isset($cp_row['blockrow']) && count($cp_row['blockrow']))

phpBB/phpbb/language/language_file_helper.php

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