From: foobar Date: Mon, 2 Apr 2007 12:41:07 +0000 (+0000) Subject: - Changed phpinfo() to make difference between set php.ini path and what was actually... X-Git-Tag: php-5.2.2RC1~71 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=24292995079373784c3ec224c9d423dd31902172;p=php - Changed phpinfo() to make difference between set php.ini path and what was actually loaded. --- diff --git a/ext/standard/info.c b/ext/standard/info.c index e89fde5152..a3b349177d 100644 --- a/ext/standard/info.c +++ b/ext/standard/info.c @@ -474,7 +474,8 @@ PHPAPI void php_print_info(int flag TSRMLS_DC) php_info_print_table_row(2, "Virtual Directory Support", "disabled" ); #endif - php_info_print_table_row(2, "Configuration File (php.ini) Path", php_ini_opened_path?php_ini_opened_path:PHP_CONFIG_FILE_PATH); + php_info_print_table_row(2, "Configuration File (php.ini) Path", PHP_CONFIG_FILE_PATH); + php_info_print_table_row(2, "Loaded Configuration File", php_ini_opened_path ? php_ini_opened_path : "(none)"); if (strlen(PHP_CONFIG_FILE_SCAN_DIR)) { php_info_print_table_row(2, "Scan this dir for additional .ini files", PHP_CONFIG_FILE_SCAN_DIR);