summaryrefslogtreecommitdiff
path: root/main/php_ini.c
diff options
context:
space:
mode:
authorSascha Schumann <sas@php.net>2002-03-04 18:46:55 +0000
committerSascha Schumann <sas@php.net>2002-03-04 18:46:55 +0000
commitb4d5aa5c50500b2cb2904c62ae8aca6c0f392cfb (patch)
tree9ccdc47145e62d78bf0e20a82ef74d4f21b244f8 /main/php_ini.c
parentf79e39cf56f82cdad8684b6bc8af688ce59787bd (diff)
downloadphp-git-b4d5aa5c50500b2cb2904c62ae8aca6c0f392cfb.tar.gz
Supply php_html_puts which escapes a whole string.. now fully works in ZTS
mode, too.
Diffstat (limited to 'main/php_ini.c')
-rw-r--r--main/php_ini.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/main/php_ini.c b/main/php_ini.c
index 975cf0b9a2..3ec52e0037 100644
--- a/main/php_ini.c
+++ b/main/php_ini.c
@@ -49,6 +49,7 @@ static void php_ini_displayer_cb(zend_ini_entry *ini_entry, int type)
} else {
char *display_string;
uint display_string_length, esc_html=0;
+ TSRMLS_FETCH();
if (type==ZEND_INI_DISPLAY_ORIG && ini_entry->modified) {
if (ini_entry->orig_value && ini_entry->orig_value[0]) {
@@ -68,9 +69,8 @@ static void php_ini_displayer_cb(zend_ini_entry *ini_entry, int type)
display_string_length = sizeof("<i>no value</i>")-1;
}
if(esc_html) {
- zend_html_puts(display_string, display_string_length);
+ php_html_puts(display_string, display_string_length TSRMLS_CC);
} else {
- TSRMLS_FETCH();
PHPWRITE(display_string, display_string_length);
}
}