svn: /php/php-src/branches/PHP_5_3/sapi/cli/ php_cli.c

felipe Sat, 11 Jun 2011 23:46:35 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=312072 Log: - Fix missing change from r303357 (related to bug #48831) Bug: http://bugs.php.net/48831 (Assigned) php -i has different output to php --ini Changed paths: U php/php-src/branches/PHP_5_3/sapi/cli/php_cli.c Modified: php/php-src/branches/PHP_5_3/sapi/cli/php_cli.c =================================================================== --- php/php-src/branches/PHP_5_3/sapi/cli/php_cli.c 2011-06-11 23:33:05 UTC (rev 312071) +++ php/php-src/branches/PHP_5_3/sapi/cli/php_cli.c 2011-06-11 23:46:35 UTC (rev 312072) @@ -1361,7 +1361,7 @@ { 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; }