Commit c2d7928e authored by David Faure's avatar David Faure
Browse files

Fix "<object> tags don't work if modules are disabled"

They should keep working for text/html, at least.
BUG: 298318
parent 9b5791b1
......@@ -507,12 +507,6 @@ void HTMLObjectBaseElementImpl::computeContent()
KHTMLPart* p = document()->part();
if (!p || !p->javaEnabled())
newRenderAlternative = true;
} else {
// Similarly for plugins.
KHTMLPart* p = document()->part();
if (!p || !p->pluginsEnabled())
newRenderAlternative = true;
}
// If there is no <embed> (here or as a child), and we don't have a type + url to go on,
......
......@@ -4400,6 +4400,11 @@ bool KHTMLPart::processObjectRequest( khtml::ChildFrame *child, const KUrl &_url
if (mime->is("text/html")
|| mime->is("application/xml")) { // this includes xhtml and svg
child->m_serviceName = "khtml";
} else {
if (!pluginsEnabled()) {
childLoadFailure(child);
return false;
}
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment