Reviewed by Brady.

        <rdar://problem/4863611> Xyle Scope crashes at launch due to WebCore-521.29.3

        * WebView/WebPreferences.m:
        (-[WebPreferences editableLinkBehavior]):
        Add nil check.

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

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 7291c5663d0272abad078d3adad00cf40d70f6ff..72af53954a84dc2af95548612b255e50839a6775 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2006-12-08  David Harrison  <harrison@apple.com>
+
+        Reviewed by Brady.
+
+        <rdar://problem/4863611> Xyle Scope crashes at launch due to WebCore-521.29.3
+
+        * WebView/WebPreferences.m:
+        (-[WebPreferences editableLinkBehavior]):
+        Add nil check.
+
 2006-12-07  Beth Dakin  <bdakin@apple.com>
 
         Reviewed by Brady.

diff --git a/WebKit/WebView/WebPreferences.m b/WebKit/WebView/WebPreferences.m
index 8d60221c43f0947ec83784c5388b8f4a252f3587..4f2b303929596978c74ff1e0bd9523aba56556aa 100644 (file)
--- a/WebKit/WebView/WebPreferences.m
+++ b/WebKit/WebView/WebPreferences.m
@@ -682,7 +682,11 @@ NS_ENDHANDLER
         // ensure that a valid result is returned
         value = WebKitEditableLinkDefaultBehavior;
     }
-    return value;
+
+    if (value != WebKitEditableLinkDefaultBehavior)
+        return value;
+    
+    return WebKitEditableLinkOnlyLiveWithShiftKey;
 }
 
 - (void)setEditableLinkBehavior:(WebKitEditableLinkBehavior)behavior