automatically de-escape all contents
This commit is contained in:
parent
70c923bea8
commit
c65fb31f19
@ -59,7 +59,7 @@ else
|
||||
USE_QT6="ON"
|
||||
|
||||
QTPATH="$(pwd)/Qt"
|
||||
QTVERSION="6.5.3"
|
||||
QTVERSION="6.7.0"
|
||||
QTBIN="$QTPATH/$QTVERSION/$QTOS/bin"
|
||||
|
||||
# Install "aqtinstall" from its master branch to have latest code.
|
||||
|
@ -31,7 +31,7 @@ if ($use_qt5 -eq "ON") {
|
||||
$qt_version = "5.15.2"
|
||||
}
|
||||
else {
|
||||
$qt_version = "6.5.3"
|
||||
$qt_version = "6.7.0"
|
||||
}
|
||||
|
||||
$is_qt_6 = $qt_version.StartsWith("6")
|
||||
|
@ -123,7 +123,7 @@ void Message::sanitize(const Feed* feed, bool fix_future_datetimes) {
|
||||
static QRegularExpression reg_news(QSL("([\\n\\r])|(^\\s)"));
|
||||
|
||||
// Sanitize title.
|
||||
m_title = qApp->web()->stripTags(qApp->web()->unescapeHtml(m_title));
|
||||
m_title = qApp->web()->stripTags(WebFactory::unescapeHtml(m_title));
|
||||
|
||||
m_title = m_title
|
||||
|
||||
@ -140,7 +140,10 @@ void Message::sanitize(const Feed* feed, bool fix_future_datetimes) {
|
||||
.remove(QChar(65279));
|
||||
|
||||
// Sanitize author.
|
||||
m_author = qApp->web()->stripTags(qApp->web()->unescapeHtml(m_author));
|
||||
m_author = qApp->web()->stripTags(WebFactory::unescapeHtml(m_author));
|
||||
|
||||
// Just unescape HTML entities. Other formatting is done by viewers.
|
||||
m_contents = WebFactory::unescapeHtml(m_contents);
|
||||
|
||||
// Sanitize URL.
|
||||
m_url = m_url.trimmed();
|
||||
|
@ -518,7 +518,7 @@ void TextBrowserViewer::downloadNextNeededResource() {
|
||||
QMetaObject::invokeMethod(m_resourceDownloader,
|
||||
"manipulateData",
|
||||
Qt::ConnectionType::QueuedConnection,
|
||||
Q_ARG(QString, qApp->web()->unescapeHtml(res.toString())),
|
||||
Q_ARG(QString, WebFactory::unescapeHtml(res.toString())),
|
||||
Q_ARG(QNetworkAccessManager::Operation, QNetworkAccessManager::Operation::GetOperation),
|
||||
Q_ARG(QByteArray, {}),
|
||||
Q_ARG(int, 5000));
|
||||
|
Loading…
x
Reference in New Issue
Block a user