summaryrefslogtreecommitdiff
path: root/src/adblock
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2011-03-09 17:19:59 +0100
committerAndrea Diamantini <adjam7@gmail.com>2011-03-09 17:19:59 +0100
commit898f6fe21bdc62ac58c96c5f127547575df2c3eb (patch)
tree57a6707c4e1cd142cf2e00462dc86fb919fca5b9 /src/adblock
parentrekonq 0.6.87 (diff)
parentReturn false for null mimetypes (diff)
downloadrekonq-898f6fe21bdc62ac58c96c5f127547575df2c3eb.tar.xz
Merge branch 'master' of git.kde.org:rekonq
Diffstat (limited to 'src/adblock')
-rw-r--r--src/adblock/adblockrulenullimpl.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/adblock/adblockrulenullimpl.cpp b/src/adblock/adblockrulenullimpl.cpp
index 7f6ab765..7c6cf802 100644
--- a/src/adblock/adblockrulenullimpl.cpp
+++ b/src/adblock/adblockrulenullimpl.cpp
@@ -117,6 +117,10 @@ bool AdBlockRuleNullImpl::isNullFilter(const QString &filter)
// collapse
if (option == QL1S("collapse"))
return true;
+
+ // Ignore null mimetypes
+ if (option == QL1S(""))
+ return false;
}
return false;