Changeset 24844 in webkit

Timestamp:

Aug 3, 2007 9:31:24 AM (17 years ago)

Author:

yongjzha

Message:

w3liu, reviewed by <​yongjun.zhang@nokia.com>

DESC: FPER-74HDN2: Strange character are shown instead of Chinese on www.sina.com.cn
​http://bugs.webkit.org/show_bug.cgi?id=14830

WARNING: NO TEST CASES ADDED OR CHANGED

• khtml/khtml_part.cpp: (KHTMLPart::write):

Location:

S60/branches/3.1m/WebCore

Files:

• ChangeLog (modified) (1 diff)
• khtml/khtml_part.cpp (modified) (1 diff)

S60/branches/3.1m/WebCore/ChangeLog

@@ +1 @@
+w3liu, reviewed by <yongjun.zhang@nokia.com>
+ DESC: FPER-74HDN2: Strange character are shown instead of Chinese on www.sina.com.cn
+ http://bugs.webkit.org/show_bug.cgi?id=14830
+
+        WARNING: NO TEST CASES ADDED OR CHANGED
+
+        * khtml/khtml_part.cpp:
+        (KHTMLPart::write):
+
 2007-07-31  yadavall  <sriram.yadavalli@nokia.com>
 

S60/branches/3.1m/WebCore/khtml/khtml_part.cpp

@@ -1695 +1695 @@
     if ( !d->m_decoder ) {
         d->m_decoder = new Decoder;
-        if (!d->m_encoding.isNull())
+        if (!d->m_encoding.isNull() && d->m_encType!=Decoder::DefaultEncoding)
             d->m_decoder->setEncoding(d->m_encoding.latin1(), d->m_encType);
         else {