mirror of
git://slackware.nl/current.git
synced 2025-01-30 08:38:10 +01:00
15 lines
648 B
Diff
15 lines
648 B
Diff
|
--- a/khtml/khtml_part.cpp
|
||
|
|
+++ b/khtml/khtml_part.cpp
|
||
|
|
@@ -1803,7 +1803,10 @@ void KHTMLPart::htmlError( int errorCode
|
||
|
|
stream >> errorName >> techName >> description >> causes >> solutions;
|
||
|
|
|
||
|
|
QString url, protocol, datetime;
|
||
|
|
- url = Qt::escape( reqUrl.prettyUrl() );
|
||
|
|
+
|
||
|
|
+ // This is somewhat confusing, but we have to escape the externally-
|
||
|
|
+ // controlled URL twice: once for i18n, and once for HTML.
|
||
|
|
+ url = Qt::escape( Qt::escape( reqUrl.prettyUrl() ) );
|
||
|
|
protocol = reqUrl.protocol();
|
||
|
|
datetime = KGlobal::locale()->formatDateTime( QDateTime::currentDateTime(),
|
||
|
|
KLocale::LongDate );
|