Merge 4b2a24ba5e into 3b03f3a8f9

[ticket/17519] Revert cron url escape back to html_attr

phpBB/adm/style/admin.css

@@ -627,7 +627,6 @@ li {
 	font-size: 0.75em;
 	text-decoration: none;
 	cursor: inherit;
-	outline-style: none;
 }
 
 @media only screen and (max-width: 700px), only screen and (max-device-width: 700px)
@@ -1173,10 +1172,6 @@ optgroup, select {
 	color: #000;
 }
 
-select:focus {
-	outline-style: none;
-}
-
 optgroup {
 	font-size: 1.00em;
 	font-weight: bold;
@@ -1442,7 +1437,6 @@ input:focus, textarea:focus {
 	border: 1px solid #BC2A4D;
 	background-color: #E9E9E2;
 	color: #BC2A4D;
-	outline-style: none;
 }
 
 @media only screen and (max-width: 700px), only screen and (max-device-width: 700px)
@@ -1592,11 +1586,6 @@ input.disabled {
 	color: #666666;
 }
 
-/* Focus states */
-input.button1:focus, input.button2:focus {
-	outline-style: none;
-}
-
 /* jQuery popups
 ---------------------------------------- */
 .phpbb_alert {

phpBB/memberlist.php

@@ -1812,6 +1812,18 @@ 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,9 +98,12 @@ 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('url') }}" width="1" height="1" alt="">
+<img class="sr-only" aria-hidden="true" src="{{ CRON_TASK_URL|e('html_attr') }}" width="1" height="1" alt="">

phpBB/styles/prosilver/theme/base.css

@@ -112,3 +112,11 @@ ul {
 abbr[title] {
 	text-decoration: none;
 }
+
+/**
+ * Fixes accessibility issue introduced by `normalize.css` by re-adding outline
+ * to elements covered by the mouse when they are navigated into via keyboard
+ */
+a:hover {
+	outline: revert;
+}

phpBB/styles/prosilver/theme/buttons.css

@@ -25,7 +25,6 @@
 .button:focus,
 .button:hover {
  	text-decoration: none;
- 	outline: none;
 }
 
 .caret {

phpBB/styles/prosilver/theme/forms.css

@@ -27,10 +27,6 @@ select {
 	font-size: 1em;
 }
 
-select:focus {
-	outline-style: none;
-}
-
 option {
 	padding-right: 1em;
 }
@@ -268,8 +264,6 @@ fieldset.submit-buttons input {
 	max-width: 100%;
 	font-size: 1.2em;
 	resize: vertical;
-	outline: 3px dashed transparent;
-	outline-offset: -4px;
 	-webkit-transition: all .5s ease, height 1ms linear;
 	-moz-transition: all .5s ease, height 1ms linear;
 	-ms-transition: all .5s ease, height 1ms linear;
@@ -296,7 +290,6 @@ fieldset.submit-buttons input {
 
 .inputbox:hover, .inputbox:focus {
 	border: 1px solid transparent;
-	outline-style: none;
 }
 
 input.inputbox	{ width: 85%; }
@@ -383,11 +376,6 @@ input.disabled {
 	font-weight: normal;
 }
 
-/* Focus states */
-input.button1:focus, input.button2:focus, input.button3:focus {
-	outline-style: none;
-}
-
 /* Topic and forum Search */
 .search-box {
 	float: left;

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%2Fcron%2Ffoo%3Ff%3D5" 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&#x2F;cron&#x2F;foo&#x3F;f&#x3D;5" width="1" height="1" alt="">', str_replace(["\n", "\t"], '', $this->wrapper->get_html_tag()));
 	}
 
 	public function test_is_parametrized_false()