--- php-5.2.11/ext/standard/html.c	2008-12-31 12:17:49.000000000 +0100
+++ active-2.11/ext/standard/html.c	2009-12-02 12:43:02.000000000 +0100
@@ -13,7 +13,7 @@
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
    | Authors: Rasmus Lerdorf <rasmus@php.net>                             |
-   |          Jaakko Hyvätti <jaakko.hyvatti@iki.fi>                      |
+   |          Jaakko Hyv?tti <jaakko.hyvatti@iki.fi>                      |
    |          Wez Furlong <wez@thebrainroom.com>                          |
    +----------------------------------------------------------------------+
 */
@@ -714,13 +714,13 @@
 static enum entity_charset determine_charset(char *charset_hint TSRMLS_DC)
 {
 	int i;
-	enum entity_charset charset = cs_8859_1;
+	enum entity_charset charset = cs_utf_8;
 	int len = 0;
 	zval *uf_result = NULL;
 
 	/* Guarantee default behaviour for backwards compatibility */
 	if (charset_hint == NULL)
-		return cs_8859_1;
+		return cs_utf_8;
 
 	if ((len = strlen(charset_hint)) != 0) {
 		goto det_charset;
@@ -1269,7 +1269,7 @@
 	char *str, *hint_charset = NULL;
 	int str_len, hint_charset_len = 0;
 	int len;
-	long quote_style = ENT_COMPAT;
+	long quote_style = ENT_QUOTES;
 	char *replaced;
 	zend_bool double_encode = 1;
 
@@ -1311,7 +1311,7 @@
 {
 	char *str, *new_str, *e, *p;
 	int len, j, i, new_len;
-	long quote_style = ENT_COMPAT;
+	long quote_style = ENT_QUOTES;
 	struct basic_entities_dec basic_entities_dec[8];
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &str, &len, &quote_style) == FAILURE) {
@@ -1377,7 +1377,7 @@
 {
 	char *str, *hint_charset = NULL;
 	int str_len, hint_charset_len, len;
-	long quote_style = ENT_COMPAT;
+	long quote_style = ENT_QUOTES;
 	char *replaced;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|ls", &str, &str_len,
@@ -1406,7 +1406,7 @@
    Returns the internal translation table used by htmlspecialchars and htmlentities */
 PHP_FUNCTION(get_html_translation_table)
 {
-	long which = HTML_SPECIALCHARS, quote_style = ENT_COMPAT;
+	long which = HTML_SPECIALCHARS, quote_style = ENT_QUOTES;
 	int i, j;
 	char ind[2];
 	enum entity_charset charset = determine_charset(NULL TSRMLS_CC);