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

They should keep working for text/html, at least.
BUG: 298318

khtml/html/html_objectimpl.cpp

@@ -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,

khtml/khtml_part.cpp

@@ -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;
+                    }
                 }
             }