luisgulo/gambas-source-code
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gb.xml.html: Fix detection of existing meta charset tags when switching to HTML5

Browse source 
[GB.XML.HTML]
* BUG: Fix detection of existing meta charset tags when switching to HTML5.
This commit is contained in:
Adrien Prokopowicz 2017-09-23 19:20:02 +02:00
parent 8da6cfd91a
commit 6fd076a9ef
No known key found for this signature in database
GPG key ID: 752A4E1D70CABBE3
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
gb.xml/src/html/htmldocument.cpp
View file

@ -265,21 +265,23 @@ void UpdateMetaCharset(Document *doc, bool html5)
size_t lenMetas;
Element **metas = XML.XMLNode_getChildrenByTagName(HtmlDocument_GetHead(doc), "meta", 4, lenMetas, 2);
Element *meta = 0;
Element *tmeta = 0;
Attribute *attr;
for(size_t i = 0; i < lenMetas; i++)
{
tmeta = metas[i];
if(doc->docType == XHTMLDocumentType)
{
attr = XML.XMLElement_GetAttribute(metas[i], "http-equiv", 11, 0);
attr = XML.XMLElement_GetAttribute(tmeta, "http-equiv", 10, 0);
if(!attr) continue;
if(!XML.GB_MatchString(attr->attrValue, attr->lenAttrValue, "Content-Type", 12, 0)) continue;
XML.XMLElement_RemoveAttribute(metas[i], attr);
attr = XML.XMLElement_GetAttribute(metas[i], "content", 7, 0);
XML.XMLElement_RemoveAttribute(tmeta, attr);
attr = XML.XMLElement_GetAttribute(tmeta, "content", 7, 0);
if(!attr) continue;
if(!XML.GB_MatchString(attr->attrValue, attr->lenAttrValue, "text/html; charset=utf-8", 25, 0)) continue;
XML.XMLElement_RemoveAttribute(metas[i], attr);
meta = metas[i];
if(!XML.GB_MatchString(attr->attrValue, attr->lenAttrValue, "text/html; charset=utf-8", 24, 0)) continue;
XML.XMLElement_RemoveAttribute(tmeta, attr);
meta = tmeta;
break;
}
else