cvs: ZendEngine2 / zend_ini.c

derick Tue Sep 3 05:57:27 2002 EDT Modified files: /ZendEngine2 zend_ini.c Log: - Revert #- Sorry... was too busy with it to notice discussion on php.dev Index: ZendEngine2/zend_ini.c diff -u ZendEngine2/zend_ini.c:1.20 ZendEngine2/zend_ini.c:1.21 --- ZendEngine2/zend_ini.c:1.20 Tue Sep 3 05:56:20 2002 +++ ZendEngine2/zend_ini.c Tue Sep 3 05:57:27 2002 @@ -305,25 +305,15 @@ display_string = ini_entry->orig_value; display_string_length = ini_entry->orig_value_length; } else { - 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; - } + display_string = "<i>no value</i>"; + display_string_length = sizeof("<i>no value</i>")-1; } } else if (ini_entry->value && ini_entry->value[0]) { display_string = ini_entry->value; display_string_length = ini_entry->value_length; } else { - 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; - } + display_string = "<i>no value</i>"; + display_string_length = sizeof("<i>no value</i>")-1; } ZEND_WRITE(display_string, display_string_length); } @@ -361,17 +351,9 @@ value = NULL; } if (value) { - if (zend_uv.html_errors) { - zend_printf("<font color=\"%s\">%s</font>", value, value); - } else { - ZEND_PUTS(value); - } + zend_printf("<font color=\"%s\">%s</font>", value, value); } else { - if (zend_uv.html_errors) { - ZEND_PUTS("<i>no value</i>;"); - } else { - ZEND_PUTS("no value"); - } + ZEND_PUTS("<i>no value</i>;"); } }