cvs: php4 /main php_ini.c

jan Thu Aug 29 06:24:03 2002 EDT Modified files: /php4/main php_ini.c Log: - reenable "no value" output. thanks to sebastian for pointing that out. Index: php4/main/php_ini.c diff -u php4/main/php_ini.c:1.98 php4/main/php_ini.c:1.99 --- php4/main/php_ini.c:1.98 Wed Aug 28 18:31:50 2002 +++ php4/main/php_ini.c Thu Aug 29 06:24:02 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_ini.c,v 1.98 2002/08/28 22:31:50 jan Exp $ */ +/* $Id: php_ini.c,v 1.99 2002/08/29 10:24:02 jan Exp $ */ /* Check CWD for php.ini */ #define INI_CHECK_CWD @@ -62,16 +62,26 @@ display_string_length = ini_entry->orig_value_length; esc_html=1; } else { - display_string = (PG(html_errors))?"<i>no value</i>":"no value"; - display_string_length = sizeof((PG(html_errors))?"<i>no value</i>":"no value")-1; + if (PG(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; esc_html=1; } else { - display_string = (PG(html_errors))?"<i>no value</i>":"no value"; - display_string_length = sizeof((PG(html_errors))?"<i>no value</i>":"no value")-1; + if (PG(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; + } } if(esc_html) { php_html_puts(display_string, display_string_length TSRMLS_CC);