From: Jan Lehnardt Date: Thu, 29 Aug 2002 09:11:22 +0000 (+0000) Subject: - fix ZTS build. thanks to edin. X-Git-Tag: RELEASE_0_91~184 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e1cac684df448a0922888ccde29f611559b4ac32;p=php - fix ZTS build. thanks to edin. --- diff --git a/ext/standard/info.c b/ext/standard/info.c index 9af3b90f1c..0f741d3ad1 100644 --- a/ext/standard/info.c +++ b/ext/standard/info.c @@ -295,9 +295,13 @@ PHPAPI void php_print_info(int flag TSRMLS_DC) if (!charset || !charset[0]) { charset = "US-ASCII"; } - php_printf("phpinfo()", charset); - PUTS(""); + if (PG(html_errors)) { + php_printf("phpinfo()", charset); + PUTS(""); + } else { + PUTS("phpinfo()"); + } if (flag & PHP_INFO_GENERAL) { char *zend_version = get_zend_version(); @@ -537,6 +541,8 @@ PHPAPI void php_print_info(int flag TSRMLS_DC) PHPAPI void php_info_print_table_start() { + TSRMLS_FETCH(); + if (PG(html_errors)) { php_printf("\n"); } else { @@ -545,7 +551,9 @@ PHPAPI void php_info_print_table_start() } PHPAPI void php_info_print_table_end() -{ +{ + TSRMLS_FETCH(); + if (PG(html_errors)) { php_printf("

\n"); } @@ -554,6 +562,8 @@ PHPAPI void php_info_print_table_end() PHPAPI void php_info_print_box_start(int flag) { + TSRMLS_FETCH(); + php_info_print_table_start(); if (flag) { if (PG(html_errors)) { @@ -570,6 +580,8 @@ PHPAPI void php_info_print_box_start(int flag) PHPAPI void php_info_print_box_end() { + TSRMLS_FETCH(); + if (PG(html_errors)) { php_printf("\n"); } @@ -578,6 +590,8 @@ PHPAPI void php_info_print_box_end() PHPAPI void php_info_print_hr() { + TSRMLS_FETCH(); + if (PG(html_errors)) { php_printf("
\n"); } else { @@ -588,6 +602,8 @@ PHPAPI void php_info_print_hr() PHPAPI void php_info_print_table_colspan_header(int num_cols, char *header) { int spaces; + + TSRMLS_FETCH(); if (PG(html_errors)) { php_printf("%s\n", num_cols, header ); @@ -605,6 +621,8 @@ PHPAPI void php_info_print_table_header(int num_cols, ...) va_list row_elements; char *row_element; + TSRMLS_FETCH(); + va_start(row_elements, num_cols); if (PG(html_errors)) { php_printf(""); @@ -640,6 +658,7 @@ PHPAPI void php_info_print_table_row(int num_cols, ...) int i; va_list row_elements; char *row_element; + TSRMLS_FETCH(); va_start(row_elements, num_cols);