diff options
| author | Derick Rethans <derick@php.net> | 2002-09-03 09:56:20 +0000 |
|---|---|---|
| committer | Derick Rethans <derick@php.net> | 2002-09-03 09:56:20 +0000 |
| commit | 74049eb191bd562d18575c6d69e5e217806a19ad (patch) | |
| tree | dd53f4bb9fe10fa19da66a4a814c10f054f2c37c /Zend/zend_ini.c | |
| parent | cfad3c664f9d854cf5baacc342390d44d9807368 (diff) | |
| download | php-git-74049eb191bd562d18575c6d69e5e217806a19ad.tar.gz | |
- MFH for: Apply rest of html errors fix (Patch by Jan Lehnardt <jan@php.net>)
Diffstat (limited to 'Zend/zend_ini.c')
| -rw-r--r-- | Zend/zend_ini.c | 30 |
1 files changed, 24 insertions, 6 deletions
diff --git a/Zend/zend_ini.c b/Zend/zend_ini.c index 42e28379cc..a9e20f41bf 100644 --- a/Zend/zend_ini.c +++ b/Zend/zend_ini.c @@ -305,15 +305,25 @@ static void zend_ini_displayer_cb(zend_ini_entry *ini_entry, int type) display_string = ini_entry->orig_value; display_string_length = ini_entry->orig_value_length; } else { - display_string = "<i>no value</i>"; - display_string_length = sizeof("<i>no value</i>")-1; + if(zend_uv.html_errors) { + display_string = "<i>no value</i>"; + display_string_length = sizeof("<i>no value</i>")-1; + } else { + display_string = "no value"; + display_string_length = sizeof("no value")-1; + } } } else if (ini_entry->value && ini_entry->value[0]) { display_string = ini_entry->value; display_string_length = ini_entry->value_length; } else { - display_string = "<i>no value</i>"; - display_string_length = sizeof("<i>no value</i>")-1; + if(zend_uv.html_errors) { + display_string = "<i>no value</i>"; + display_string_length = sizeof("<i>no value</i>")-1; + } else { + display_string = "no value"; + display_string_length = sizeof("no value")-1; + } } ZEND_WRITE(display_string, display_string_length); } @@ -351,9 +361,17 @@ ZEND_INI_DISP(zend_ini_color_displayer_cb) value = NULL; } if (value) { - zend_printf("<font color=\"%s\">%s</font>", value, value); + if (zend_uv.html_errors) { + zend_printf("<font color=\"%s\">%s</font>", value, value); + } else { + ZEND_PUTS(value); + } } else { - ZEND_PUTS("<i>no value</i>;"); + if (zend_uv.html_errors) { + ZEND_PUTS("<i>no value</i>;"); + } else { + ZEND_PUTS("no value"); + } } } |