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

List:       kde-commits
Subject:    branches/KDE/3.4/kdelibs/khtml
From:       Harri Porten <porten () kde ! org>
Date:       2005-05-17 19:53:43
Message-ID: 1116359623.249187.17136.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 415170 by porten:

merged innerHTML/Text fix from trunk (r413942).


 M  +3 -0      branches/KDE/3.4/kdelibs/khtml/ChangeLog  
 M  +2 -2      branches/KDE/3.4/kdelibs/khtml/html/html_elementimpl.cpp  


--- branches/KDE/3.4/kdelibs/khtml/ChangeLog #415169:415170
@@ -1,5 +1,8 @@
 2005-05-17  Harri Porten  <porten@kde.org>
 
+	* html/html_elementimpl.cpp: always return a non-null string
+	from innerHTML() and innerText()
+
 	* ecma/kjs_window.cpp: allow setting location.href on foreign
 	windows opened by window.open() again (bug #101178).
 
--- branches/KDE/3.4/kdelibs/khtml/html/html_elementimpl.cpp #415169:415170
@@ -438,7 +438,7 @@
 
 DOMString HTMLElementImpl::innerHTML() const
 {
-    DOMString result;
+    DOMString result = "";
     for (NodeImpl *child = firstChild(); child != NULL; child = child->nextSibling())
         result += child->toString();
     return result;
@@ -446,7 +446,7 @@
 
 DOMString HTMLElementImpl::innerText() const
 {
-    DOMString text;
+    DOMString text = "";
     if(!firstChild())
         return text;
 
[prev in list] [next in list] [prev in thread] [next in thread]