diff --git a/Base/res/html/error.html b/Base/res/html/error.html index 8b06ed12a8de6f..c9d254c81d7bbd 100644 --- a/Base/res/html/error.html +++ b/Base/res/html/error.html @@ -14,8 +14,8 @@
Warning -

Failed to load {}

+

Failed to load @failed_url@

-

Error: {}

+

Error: @error@

diff --git a/Userland/Libraries/LibWeb/Loader/FrameLoader.cpp b/Userland/Libraries/LibWeb/Loader/FrameLoader.cpp index d547580117f61b..147bafa74bfb22 100644 --- a/Userland/Libraries/LibWeb/Loader/FrameLoader.cpp +++ b/Userland/Libraries/LibWeb/Loader/FrameLoader.cpp @@ -26,6 +26,7 @@ #include #include +#include #include #include #include @@ -226,13 +227,12 @@ void FrameLoader::load_error_page(const URL& failed_url, const String& error) error_page_url, [this, failed_url, error](auto data, auto&, auto) { VERIFY(!data.is_null()); -#pragma GCC diagnostic ignored "-Wformat-nonliteral" - auto html = String::formatted( - data, - escape_html_entities(failed_url.to_string()), - escape_html_entities(error)); -#pragma GCC diagnostic pop - auto document = HTML::parse_html_document(html, failed_url, "utf-8"); + StringBuilder builder; + SourceGenerator generator { builder }; + generator.set("failed_url", failed_url.to_string()); + generator.set("error", error); + generator.append(data); + auto document = HTML::parse_html_document(generator.as_string_view(), failed_url, "utf-8"); VERIFY(document); frame().set_document(document); },