--- ext/standard/info.c 2005-06-07 15:37:33.000000000 +0200 +++ ext/standard/info.c 2005-11-01 01:26:54.000000000 +0100 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: info.c,v 1.218.2.18.2.1 2005/06/07 13:37:33 derick Exp $ */ +/* $Id: info.c,v 1.218.2.18.2.4 2005/08/16 00:26:02 iliaa Exp $ */ #include "php.h" #include "php_ini.h" @@ -133,10 +133,21 @@ PUTS(" => "); } if (Z_TYPE_PP(tmp) == IS_ARRAY) { + zval *tmp3; + MAKE_STD_ZVAL(tmp3); if (!sapi_module.phpinfo_as_text) { PUTS("
"); } + php_start_ob_buffer(NULL, 4096, 1 TSRMLS_CC); zend_print_zval_r(*tmp, 0); + php_ob_get_buffer(tmp3 TSRMLS_CC); + php_end_ob_buffer(0, 0 TSRMLS_CC); + + elem_esc = php_info_html_esc(Z_STRVAL_P(tmp3) TSRMLS_CC); + PUTS(elem_esc); + efree(elem_esc); + zval_ptr_dtor(&tmp3); + if (!sapi_module.phpinfo_as_text) { PUTS(""); } @@ -196,7 +207,7 @@ PHPAPI char *php_info_html_esc(char *string TSRMLS_DC) { int new_len; - return php_escape_html_entities(string, strlen(string), &new_len, 0, ENT_NOQUOTES, NULL TSRMLS_CC); + return php_escape_html_entities(string, strlen(string), &new_len, 0, ENT_QUOTES, NULL TSRMLS_CC); } /* }}} */