diff options
| author |  Hoà V. DINH <dinh.viet.hoa@gmail.com> | 2014-07-15 22:32:59 -0700 |
|---|---|---|
| committer | Hoà V. DINH <dinh.viet.hoa@gmail.com> | 2014-07-15 22:32:59 -0700 |
| commit | 1c4906300f67bfd2f6d8f248659228863983bbc5 (patch) | |
| tree | da1f405d91b97d70b14df2bfa07ec8dc3fc588e2 /src/core | |
| parent | cd9f04962fe6c49f8fff5daa591f5aa836f626bf (diff) | |
| parent | 002afba1ab5de03824c8c773d18259830eec8de5 (diff) | |
Merge pull request #770 from foxinushka/master
Fixed DOCTYPE in MCHTMLCleaner
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/basetypes/MCHTMLCleaner.cc | 2 | ||||
| -rwxr-xr-x | src/core/imap/MCIMAPSession.cc | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/core/basetypes/MCHTMLCleaner.cc b/src/core/basetypes/MCHTMLCleaner.cc index 079163bf..81145c9e 100644 --- a/src/core/basetypes/MCHTMLCleaner.cc +++ b/src/core/basetypes/MCHTMLCleaner.cc @@ -43,6 +43,8 @@ String * HTMLCleaner::cleanHTML(String * input) tidyOptSetBool(tdoc, TidyDropEmptyElems, no); #endif tidyOptSetBool(tdoc, TidyXhtmlOut, yes); + tidyOptSetInt(tdoc, TidyDoctypeMode, TidyDoctypeUser); + tidyOptSetBool(tdoc, TidyMark, no); tidySetCharEncoding(tdoc, "utf8"); tidyOptSetBool(tdoc, TidyForceOutput, yes); diff --git a/src/core/imap/MCIMAPSession.cc b/src/core/imap/MCIMAPSession.cc index 09ee841d..780012d4 100755 --- a/src/core/imap/MCIMAPSession.cc +++ b/src/core/imap/MCIMAPSession.cc @@ -3607,6 +3607,10 @@ void IMAPSession::capabilitySetWithSessionState(IndexSet * capabilities) if (mailimap_has_compress_deflate(mImap)) { capabilities->addIndex(IMAPCapabilityCompressDeflate); } + if (mailimap_has_extension(mImap, (char *)"CHILDREN")) { + capabilities->addIndex(IMAPCapabilityChildren); + } + applyCapabilities(capabilities); } |