Merge 4b2a24ba5e into 2f43c1facd

phpBB/memberlist.php

@@ -1812,18 +1812,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

@@ -98,12 +98,9 @@ class twig extends \phpbb\template\base
 		$this->twig = $twig_environment;
 
 		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 && is_dir($this->phpbb_root_path . $this->path_helper->get_adm_relative_path() . 'style/'))

phpBB/styles/all/template/cron.html

@@ -4,4 +4,4 @@
 	to hide visually and `aria-hidden="true"` to hide from screen-readers; using
 	`hidden` or `display: none` would prevent the task from running.
 #}
-<img class="sr-only" aria-hidden="true" src="{{ CRON_TASK_URL|e('html_attr') }}" width="1" height="1" alt="">
+<img class="sr-only" aria-hidden="true" src="{{ CRON_TASK_URL|e('url') }}" width="1" height="1" alt="">

tests/cron/wrapper_test.php

@@ -67,7 +67,7 @@ class phpbb_cron_wrapper_test extends phpbb_template_template_test_case
 			$this->template
 		);
 
-		$this->assertEquals('<img class="sr-only" aria-hidden="true" src="app.php&#x2F;cron&#x2F;foo&#x3F;f&#x3D;5" width="1" height="1" alt="">', str_replace(["\n", "\t"], '', $this->wrapper->get_html_tag()));
+		$this->assertEquals('<img class="sr-only" aria-hidden="true" src="app.php%2Fcron%2Ffoo%3Ff%3D5" width="1" height="1" alt="">', str_replace(["\n", "\t"], '', $this->wrapper->get_html_tag()));
 	}
 
 	public function test_is_parametrized_false()