Merge 3f4be7e3af into 954bc07de1

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

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

@@ -145,31 +145,29 @@ 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')))
-			@fclose($fp);
-			try
 			{
-				$this->filesystem->phpbb_chmod($path,
+				$exists = $writable = false;
-					\phpbb\filesystem\filesystem_interface::CHMOD_READ | \phpbb\filesystem\filesystem_interface::CHMOD_WRITE
-				);
-				$exists = true;
 			}
-			catch (\phpbb\filesystem\exception\filesystem_exception $e)
+			else
 			{
-				// Do nothing
+				@fclose($fp);
+				try
+				{
+					$this->filesystem->phpbb_chmod($path,
+						\phpbb\filesystem\filesystem_interface::CHMOD_READ | \phpbb\filesystem\filesystem_interface::CHMOD_WRITE
+					);
+					$exists = true;
+				}
+				catch (\phpbb\filesystem\exception\filesystem_exception $e)
+				{
+					$writable = false;
+				}
 			}
 		}
-
+		else if (!$this->filesystem->is_writable($path))
-		if (file_exists($path))
 		{
-			if (!$this->filesystem->is_writable($path))
+			$writable = false;
-			{
-				$writable = false;
-			}
-		}
-		else
-		{
-			$exists = $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()