[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[cblu]

The following commit has been merged in the debian/unstable branch:
commit 27cd1530cb00b32adf9509128f9c5b0b096136f1
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 1 00:08:26 2003 +0000

    	Fixed: <rdar://problem/3428262>: Plugin loads for static files, but not PHP scripts
    
            Reviewed by rjw.
    
            * WebCoreSupport.subproj/WebBridge.m:
            (-[WebBridge frameRequiredForMIMEType:]): load the plug-in DB so this method returns reliable results.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5096 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index c058a7f..7bc7ee2 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,14 @@
 2003-09-30  Chris Blumenberg  <cblu at apple.com>
 
+	Fixed: <rdar://problem/3428262>: Plugin loads for static files, but not PHP scripts
+
+        Reviewed by rjw.
+
+        * WebCoreSupport.subproj/WebBridge.m:
+        (-[WebBridge frameRequiredForMIMEType:]): load the plug-in DB so this method returns reliable results.
+
+2003-09-30  Chris Blumenberg  <cblu at apple.com>
+
 	Fixed: <rdar://problem/3006869>: show image dimensions in title bar when single image is loaded
 
         Reviewed by rjw.
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index 5ed76f3..90c9948 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -788,15 +788,21 @@ static BOOL loggedObjectCacheSize = NO;
     return cacheSize * multiplier;
 }
 
-- (BOOL)frameRequiredForMIMEType:(NSString*)mimeType
+- (BOOL)frameRequiredForMIMEType:(NSString*)MIMEType
 {
     // Assume a plugin is required. Don't make a frame.
-    if ([mimeType length] == 0)
+    if ([MIMEType length] == 0) {
         return NO;
+    }
+    
+    // Have the plug-in DB register document views.
+    [[WebPluginDatabase installedPlugins] loadPluginIfNeededForMIMEType:MIMEType];
     
-    Class result = [WebFrameView _viewClassForMIMEType:mimeType];
-    if (!result)
-        return NO;  // Want to display a "plugin not found" dialog/image, so let a plugin get made.
+    Class result = [WebFrameView _viewClassForMIMEType:MIMEType];
+    if (!result) {
+        // Want to display a "plugin not found" dialog/image, so let a plugin get made.
+        return NO;
+    }
         
     // If we're a supported type other than a plugin, we want to make a frame.
     // Ultimately we should just use frames for all mime types (plugins and HTML/XML/text documents),

-- 
WebKit Debian packaging