Merge 063f0aec45 into 03031e846d

[ticket/17527] Add Twig extensions existence check while registering

phpBB/phpbb/language/language_file_helper.php

@@ -135,17 +135,6 @@ class language_file_helper
 	 */
 	private static function sort_by_local_name(mixed $a, mixed $b): int
 	{
-		if ($a['local_name'] > $b['local_name'])
+		return $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,9 +87,12 @@ 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