Merge 063f0aec45 into 9c49a2b86b

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

@@ -87,12 +87,9 @@ class twig extends \phpbb\template\base
 		$this->loader = $twig_environment->getLoader();
 
 		foreach ($extensions as $extension)
-		{
-			if (!$this->twig->hasExtension(get_class($extension)))
 		{
 			$this->twig->addExtension($extension);
 		}
-		}
 
 		// Add admin namespace
 		if ($this->path_helper->get_adm_relative_path() !== null