Merge 3f4be7e3af into 954bc07de1

[ticket/17529] Fix installer config.php availability checks

phpBB/phpbb/install/module/requirements/task/check_filesystem.php

@@ -145,7 +145,12 @@ class check_filesystem extends \phpbb\install\task_base
 		// Try to create file if it does not exists
 		if (!file_exists($path))
 		{
-			$fp = @fopen($path, 'w');
+			if (!is_resource($fp = @fopen($path, 'w')))
+			{
+				$exists = $writable = false;
+			}
+			else
+			{
 				@fclose($fp);
 				try
 				{
@@ -155,21 +160,14 @@ class check_filesystem extends \phpbb\install\task_base
 					$exists = true;
 				}
 				catch (\phpbb\filesystem\exception\filesystem_exception $e)
-			{
-				// Do nothing
-			}
-		}
-
-		if (file_exists($path))
-		{
-			if (!$this->filesystem->is_writable($path))
 				{
 					$writable = false;
 				}
 			}
-		else
+		}
+		else if (!$this->filesystem->is_writable($path))
 		{
-			$exists = $writable = false;
+			$writable = false;
 		}
 
 		$this->set_test_passed(($exists && $writable) || $failable);

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="">

tests/cron/wrapper_test.php

@@ -60,7 +60,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()