diff --git a/resources/text/CHANGELOG b/resources/text/CHANGELOG
index 7e359ca4e..1a2165e12 100644
--- a/resources/text/CHANGELOG
+++ b/resources/text/CHANGELOG
@@ -1,4 +1,4 @@
-
+
+
+
2.5.0
Added:
@@ -28,8 +30,13 @@
- Fancy & modern popup notifications (turned on by default).
- Enhanced information in download manager.
- Added ability to change font for internal message viewer.
+ - Updated URLs of some Adblock subscriptions.
-
+
+ Fixed:
+
+ - Adblock subscriptions starting with faulty " [Adblock..."] are now correctly loaded.
+
2.4.2
Fixed:
diff --git a/src/network-web/adblock/adblocksubscription.cpp b/src/network-web/adblock/adblocksubscription.cpp
index fb55e3ac8..ff1497e97 100755
--- a/src/network-web/adblock/adblocksubscription.cpp
+++ b/src/network-web/adblock/adblocksubscription.cpp
@@ -162,7 +162,12 @@ void AdBlockSubscription::subscriptionDownloaded() {
}
bool error = false;
- const QByteArray response = QString::fromUtf8(downloader->lastOutputData()).toUtf8();
+ QByteArray response = QString::fromUtf8(downloader->lastOutputData()).toUtf8();
+
+ if (response.startsWith(' ')) {
+ // Deal with " [Adblock".
+ response = response.remove(0, 1);
+ }
if (downloader->lastOutputError() != QNetworkReply::NoError ||
!response.startsWith(QByteArray("[Adblock")) ||
@@ -208,12 +213,13 @@ bool AdBlockSubscription::saveDownloadedData(const QByteArray &data) {
file.write(part2);
file.flush();
file.close();
- return true;
+ }
+ else {
+ file.write(data);
+ file.flush();
+ file.close();
}
- file.write(data);
- file.flush();
- file.close();
return true;
}