summaryrefslogtreecommitdiff
path: root/main/php_ini.c
diff options
context:
space:
mode:
authorMarcus Boerger <helly@php.net>2003-03-29 21:25:03 +0000
committerMarcus Boerger <helly@php.net>2003-03-29 21:25:03 +0000
commitb5c97d8dabc0dcfe0a1a42a6245c13b486ba7d86 (patch)
treee22361640b4dba778d0153a2ef7e2c95148031ba /main/php_ini.c
parentc21f2b7493f38b62c391c56f55067ccc79be7c7c (diff)
downloadphp-git-b5c97d8dabc0dcfe0a1a42a6245c13b486ba7d86.tar.gz
fix phpinfo() & php -i
Diffstat (limited to 'main/php_ini.c')
-rw-r--r--main/php_ini.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/main/php_ini.c b/main/php_ini.c
index 2422392f9b..9b3fe10c63 100644
--- a/main/php_ini.c
+++ b/main/php_ini.c
@@ -67,9 +67,9 @@ static void php_ini_displayer_cb(zend_ini_entry *ini_entry, int type)
if (ini_entry->orig_value && ini_entry->orig_value[0]) {
display_string = ini_entry->orig_value;
display_string_length = ini_entry->orig_value_length;
- esc_html = 1;
+ esc_html = !sapi_module.phpinfo_as_text;
} else {
- if (PG(html_errors)) {
+ if (!sapi_module.phpinfo_as_text) {
display_string = "<i>no value</i>";
display_string_length = sizeof("<i>no value</i>") - 1;
} else {
@@ -80,9 +80,9 @@ static void php_ini_displayer_cb(zend_ini_entry *ini_entry, int type)
} else if (ini_entry->value && ini_entry->value[0]) {
display_string = ini_entry->value;
display_string_length = ini_entry->value_length;
- esc_html=1;
+ esc_html = !sapi_module.phpinfo_as_text;
} else {
- if (PG(html_errors)) {
+ if (!sapi_module.phpinfo_as_text) {
display_string = "<i>no value</i>";
display_string_length = sizeof("<i>no value</i>") - 1;
} else {
@@ -107,7 +107,7 @@ static int php_ini_displayer(zend_ini_entry *ini_entry, int module_number TSRMLS
if (ini_entry->module_number != module_number) {
return 0;
}
- if (PG(html_errors)) {
+ if (!sapi_module.phpinfo_as_text) {
PUTS("<tr>");
PUTS("<td class=\"e\">");
PHPWRITE(ini_entry->name, ini_entry->name_length - 1);