WebKit:

	Fixed: <rdar://problem/3874577> Opening restricted (parental) content in new window/tab reveals Safari's "Resources" folder

        Reviewed by john.

        * WebView.subproj/WebDefaultContextMenuDelegate.m:
        (-[WebDefaultUIDelegate openFrameInNewWindow:]): use the unreachable URL if there is one

WebBrowser:

	Fixed: <rdar://problem/3874577> Opening restricted (parental) content in new window/tab reveals Safari's "Resources" folder

        Reviewed by john.

        * ContextMenuHandler.m:
        (-[BrowserWebView openFrameInNewTab:]): use the unreachable URL if there is one

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@7995 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index a028f8a8e9be5d3c1d9940016a0b110f3b0e1807..923a69846163101b143e980d7c12bc862ac0438f 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2004-11-12  Chris Blumenberg  <cblu@apple.com>
+
+       Fixed: <rdar://problem/3874577> Opening restricted (parental) content in new window/tab reveals Safari's "Resources" folder
+       
+        Reviewed by john.
+
+        * WebView.subproj/WebDefaultContextMenuDelegate.m:
+        (-[WebDefaultUIDelegate openFrameInNewWindow:]): use the unreachable URL if there is one
+
 === Safari-171 ===
 
 2004-11-11  Richard Williamson   <rjw@apple.com>

diff --git a/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
index 52237f4ef9a8b29feb6736f6d6e5468218e11ff3..8b2118d1e1706c6784e5b9775b201f29d63a36da 100644 (file)
--- a/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
@@ -323,8 +323,12 @@
 - (void)openFrameInNewWindow:(id)sender
 {
     NSDictionary *element = [sender representedObject];
-    WebFrame *webFrame = [element objectForKey:WebElementFrameKey];
-    [self openNewWindowWithURL:[[webFrame dataSource] _URL] element:element];
+    WebDataSource *dataSource = [[element objectForKey:WebElementFrameKey] dataSource];
+    NSURL *URL = [dataSource unreachableURL];
+    if (URL == nil) {
+        URL = [[dataSource request] URL];
+    }    
+    [self openNewWindowWithURL:URL element:element];
 }
 
 @end