cvs: Zend / zend_ini.c

derick Tue Sep 3 05:55:33 2002 EDT Modified files: /Zend zend_ini.c Log: - Apply rest of html errors fix (Patch by Jan Lehnardt <jan@php.net>) Index: Zend/zend_ini.c diff -u Zend/zend_ini.c:1.18 Zend/zend_ini.c:1.19 --- Zend/zend_ini.c:1.18 Sun Jan 6 10:21:09 2002 +++ Zend/zend_ini.c Tue Sep 3 05:55:33 2002 @@ -308,15 +308,25 @@ 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); } @@ -354,9 +364,17 @@ 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"); + } } }