From: Derick Rethans Date: Tue, 3 Sep 2002 09:57:27 +0000 (+0000) Subject: - Revert X-Git-Tag: RELEASE_0_91~149 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=45a203b41141a3deb81026308eb2fc278480805e;p=php - Revert #- Sorry... was too busy with it to notice discussion on php.dev --- diff --git a/Zend/zend_ini.c b/Zend/zend_ini.c index a9e20f41bf..42e28379cc 100644 --- a/Zend/zend_ini.c +++ b/Zend/zend_ini.c @@ -305,25 +305,15 @@ 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 { - if(zend_uv.html_errors) { - display_string = "no value"; - display_string_length = sizeof("no value")-1; - } else { - display_string = "no value"; - display_string_length = sizeof("no value")-1; - } + 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 { - if(zend_uv.html_errors) { - display_string = "no value"; - display_string_length = sizeof("no value")-1; - } else { - display_string = "no value"; - display_string_length = sizeof("no value")-1; - } + display_string = "no value"; + display_string_length = sizeof("no value")-1; } ZEND_WRITE(display_string, display_string_length); } @@ -361,17 +351,9 @@ ZEND_INI_DISP(zend_ini_color_displayer_cb) value = NULL; } if (value) { - if (zend_uv.html_errors) { - zend_printf("%s", value, value); - } else { - ZEND_PUTS(value); - } + zend_printf("%s", value, value); } else { - if (zend_uv.html_errors) { - ZEND_PUTS("no value;"); - } else { - ZEND_PUTS("no value"); - } + ZEND_PUTS("no value;"); } }