diff options
| author | Jan Lehnardt <jan@php.net> | 2002-08-29 10:24:02 +0000 |
|---|---|---|
| committer | Jan Lehnardt <jan@php.net> | 2002-08-29 10:24:02 +0000 |
| commit | d6497fc96e0d5bfe8ecde252adb74e33dc430eaf (patch) | |
| tree | ac2b2980b713b8e9986c6ce4d2f82111046827c1 /main/php_ini.c | |
| parent | a00f439ff08ffc3c2476ca93f77cbeb8390143b0 (diff) | |
| download | php-git-d6497fc96e0d5bfe8ecde252adb74e33dc430eaf.tar.gz | |
- reenable "no value" output. thanks to sebastian for pointing that out.
Diffstat (limited to 'main/php_ini.c')
| -rw-r--r-- | main/php_ini.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/main/php_ini.c b/main/php_ini.c index 5f468608ae..aa4675698e 100644 --- a/main/php_ini.c +++ b/main/php_ini.c @@ -62,16 +62,26 @@ static void php_ini_displayer_cb(zend_ini_entry *ini_entry, int type) 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); |