diff options
| author | Zeev Suraski <zeev@php.net> | 2002-09-03 10:06:13 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2002-09-03 10:06:13 +0000 |
| commit | 5f3e75a725958e32df25aeb44cd9ae9a8e55f4d6 (patch) | |
| tree | f3532e3acd8cf52aaa40307d3bad30346a2c3532 /Zend/zend_ini.c | |
| parent | 45a203b41141a3deb81026308eb2fc278480805e (diff) | |
| download | php-git-5f3e75a725958e32df25aeb44cd9ae9a8e55f4d6.tar.gz | |
MFZE1
Diffstat (limited to 'Zend/zend_ini.c')
| -rw-r--r-- | Zend/zend_ini.c | 32 |
1 files changed, 26 insertions, 6 deletions
diff --git a/Zend/zend_ini.c b/Zend/zend_ini.c index 42e28379cc..cfeae83363 100644 --- a/Zend/zend_ini.c +++ b/Zend/zend_ini.c @@ -25,6 +25,8 @@ static HashTable *registered_zend_ini_directives; +#define NO_VALUE_PLAINTEXT "no value" +#define NO_VALUE_HTML "<i>no value</i>" /* * hash_apply functions @@ -305,15 +307,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 = NO_VALUE_HTML; + display_string_length = sizeof(NO_VALUE_HTML)-1; + } else { + display_string = NO_VALUE_PLAINTEXT; + display_string_length = sizeof(NO_VALUE_PLAINTEXT)-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 = NO_VALUE_HTML; + display_string_length = sizeof(NO_VALUE_HTML)-1; + } else { + display_string = NO_VALUE_PLAINTEXT; + display_string_length = sizeof(NO_VALUE_PLAINTEXT)-1; + } } ZEND_WRITE(display_string, display_string_length); } @@ -351,9 +363,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(NO_VALUE_HTML); + } else { + ZEND_PUTS(NO_VALUE_PLAINTEXT); + } } } |