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

[mjs]

The following commit has been merged in the debian/unstable branch:
commit a36bffb87ecb118f0a49398c12a683b5e2224da4
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 9 16:49:05 2002 +0000

            Reviewed by Darin.
    
    	- fixed 3103954 - preferences not displayed properly at excite.com
    
            * khtml/html/html_formimpl.cpp:
            (HTMLInputElementImpl::value): If a radio or checkbox input has a
    	value, return that rather than something based on the checked
    	state. Only fall back on the checked state if there is no value.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2976 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 46fb45f..aacb6df 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -2,6 +2,17 @@
 
         Reviewed by Darin.
 
+	- fixed 3103954 - preferences not displayed properly at excite.com
+	
+        * khtml/html/html_formimpl.cpp:
+        (HTMLInputElementImpl::value): If a radio or checkbox input has a
+	value, return that rather than something based on the checked
+	state. Only fall back on the checked state if there is no value.
+
+2002-12-09  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Darin.
+
 	- fixed 3103036 - REGRESSION: scripts dropped from DOM tree;
 	javascript text rendered to screen
 
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 46fb45f..aacb6df 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -2,6 +2,17 @@
 
         Reviewed by Darin.
 
+	- fixed 3103954 - preferences not displayed properly at excite.com
+	
+        * khtml/html/html_formimpl.cpp:
+        (HTMLInputElementImpl::value): If a radio or checkbox input has a
+	value, return that rather than something based on the checked
+	state. Only fall back on the checked state if there is no value.
+
+2002-12-09  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Darin.
+
 	- fixed 3103036 - REGRESSION: scripts dropped from DOM tree;
 	javascript text rendered to screen
 
diff --git a/WebCore/khtml/html/html_formimpl.cpp b/WebCore/khtml/html/html_formimpl.cpp
index dd1b931..f96d055 100644
--- a/WebCore/khtml/html/html_formimpl.cpp
+++ b/WebCore/khtml/html/html_formimpl.cpp
@@ -1352,10 +1352,10 @@ void HTMLInputElementImpl::setChecked(bool _checked)
 
 DOMString HTMLInputElementImpl::value() const
 {
-    if (m_type == CHECKBOX || m_type == RADIO) {
-        if (m_value.isNull() && m_checked)
+    if ((m_type == CHECKBOX || m_type == RADIO) && m_value.isNull()) {
+        if (m_checked)
             return DOMString("on");
-        if (!m_checked)
+        else
             return DOMString("");
     }
 

-- 
WebKit Debian packaging