From b6d8462ab21c00abdf19ecfbb15ec1ef9036d209 Mon Sep 17 00:00:00 2001 From: Pierre Joye Date: Tue, 14 Sep 2010 10:36:21 +0000 Subject: [PATCH] - fix #48831 php -i has different output to php --ini --- sapi/cli/php_cli.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c index 2fdba62a0d..8936b2aebe 100644 --- a/sapi/cli/php_cli.c +++ b/sapi/cli/php_cli.c @@ -100,6 +100,7 @@ #endif PHPAPI extern char *php_ini_opened_path; +PHPAPI extern char *php_ini_scanned_path; PHPAPI extern char *php_ini_scanned_files; #ifndef O_BINARY @@ -1424,7 +1425,7 @@ int main(int argc, char *argv[]) { zend_printf("Configuration File (php.ini) Path: %s\n", PHP_CONFIG_FILE_PATH); zend_printf("Loaded Configuration File: %s\n", php_ini_opened_path ? php_ini_opened_path : "(none)"); - zend_printf("Scan for additional .ini files in: %s\n", *PHP_CONFIG_FILE_SCAN_DIR ? PHP_CONFIG_FILE_SCAN_DIR : "(none)"); + zend_printf("Scan for additional .ini files in: %s\n", php_ini_scanned_path ? php_ini_scanned_path : "(none)"); zend_printf("Additional .ini files parsed: %s\n", php_ini_scanned_files ? php_ini_scanned_files : "(none)"); break; } -- 2.40.0