Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

- reenable "no value" output. thanks to sebastian for pointing that …

…out.
  • Loading branch information...
commit d6497fc96e0d5bfe8ecde252adb74e33dc430eaf 1 parent a00f439
Jan Lehnardt authored
Showing with 14 additions and 4 deletions.
  1. +14 −4 main/php_ini.c
View
18 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);
Please sign in to comment.
Something went wrong with that request. Please try again.