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 1;
-		}
-		else if ($a['local_name'] < $b['local_name'])
-		{
-			return -1;
-		}
-		else
-		{
-			return 0;
-		}
+		return $a['local_name'] <=> $b['local_name'];
 	}
 }

phpBB/phpbb/messenger/method/email.php

@@ -365,7 +365,7 @@ class email extends base
 			$this->set_dsn();
 		}
 
-		$this->transport = Transport::fromDsn($this->dsn);
+		$this->transport = Transport::fromDsn($this->dsn, $this->dispatcher);
 
 		if ($this->config['smtp_delivery'] && method_exists($this->transport, 'getStream'))
 		{

phpBB/phpbb/template/twig/twig.php

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