[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kfm-devel
Subject:    possible fix #32579
From:       Dirk Mueller <dmuell () gmx ! net>
Date:       2002-03-26 1:49:18
[Download RAW message or body]

Hi, 

untested...


Dirk

["frameloading.diff" (text/plain)]

Index: html_baseimpl.cpp
===================================================================
RCS file: /home/kde/kdelibs/khtml/html/html_baseimpl.cpp,v
retrieving revision 1.159
diff -u -5 -d -p -r1.159 html_baseimpl.cpp
--- html_baseimpl.cpp	2002/03/22 20:42:34	1.159
+++ html_baseimpl.cpp	2002/03/26 01:47:53
@@ -316,12 +316,15 @@ void HTMLFrameElementImpl::attach()
     // we need a unique name for every frame in the frameset. Hope that's unique enough.
     if(name.isEmpty() || w->part()->frameExists( name.string() ) )
       name = DOMString(w->part()->requestFrameName());
 
     // load the frame contents
-    if (!url.isEmpty())
-        w->part()->requestFrame( static_cast<RenderFrame*>(m_render), url.string(), name.string() );
+    if (!url.isEmpty()) {
+        KURL fullURL = getDocument()->completeURL( url.string() );
+        if ( !(w->part()->onlyLocalReferences() && fullURL.protocol() != "file"))
+            w->part()->requestFrame( static_cast<RenderFrame*>(m_render), url.string(), name.string() );
+    }
 }
 
 void HTMLFrameElementImpl::detach()
 {
     HTMLElementImpl::detach();


[prev in list] [next in list] [prev in thread] [next in thread]