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

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit d8811d7df515b7b5cd371f21578c38a475485d2a
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Feb 11 00:02:10 2004 +0000

    	Fix for osnews.com's wacky layout problem.  Put back in the check for isEmpty.
    
            Reviewed by darin
    
            * khtml/html/htmltokenizer.cpp:
            (khtml::HTMLTokenizer::scriptHandler):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6061 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 9954360..3f3ff2d 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,14 @@
 2004-02-10  David Hyatt  <hyatt at apple.com>
 
+	Fix for osnews.com's wacky layout problem.  Put back in the check for isEmpty.
+	
+        Reviewed by darin
+
+        * khtml/html/htmltokenizer.cpp:
+        (khtml::HTMLTokenizer::scriptHandler):
+
+2004-02-10  David Hyatt  <hyatt at apple.com>
+
 	Fix for the bad background color on abcnews.com.  Make cloning optionally drop the style declarations.
 
         * khtml/html/html_elementimpl.cpp:
diff --git a/WebCore/khtml/html/htmltokenizer.cpp b/WebCore/khtml/html/htmltokenizer.cpp
index f7de02c..5efada7 100644
--- a/WebCore/khtml/html/htmltokenizer.cpp
+++ b/WebCore/khtml/html/htmltokenizer.cpp
@@ -525,9 +525,8 @@ void HTMLTokenizer::scriptHandler()
 	// kdDebug( 6036 ) << "adding pending Output to parsed string" << endl;
 	src.append(pendingSrc);
 	pendingSrc.clear();
-    } else {
+    } else if (!prependingSrc.isEmpty())
         write(prependingSrc, false);
-    }
 }
 
 void HTMLTokenizer::scriptExecution( const QString& str, QString scriptURL,

-- 
WebKit Debian packaging