Merge b82d7d3f47 into 9c49a2b86b

phpBB/memberlist.php

@@ -1681,18 +1681,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/language/language_file_helper.php

@@ -135,6 +135,17 @@ class language_file_helper
 	 */
 	private static function sort_by_local_name(mixed $a, mixed $b): int
 	{
-		return $a['local_name'] <=> $b['local_name'];
+		if ($a['local_name'] > $b['local_name'])
+		{
+			return 1;
+		}
+		else if ($a['local_name'] < $b['local_name'])
+		{
+			return -1;
+		}
+		else
+		{
+			return 0;
+		}
 	}
 }

phpBB/phpbb/template/twig/twig.php

@@ -88,10 +88,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