Merge 45a69eca14 into b8c49f9711

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/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