Skip to content

Commit 89dc8d7

Browse files
authored
cli: Fix swapped output in php --ini (php#18557)
In php#18527, I accidentally swapped the values. This is before my modification: ``` 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_ini_scanned_path ? php_ini_scanned_path : "(none)"); ``` - "Loaded Configuration File" should be `php_ini_opened_path` - "Scan for additional .ini files in" shoudl be `php_ini_scanned_path`
1 parent 1de16c7 commit 89dc8d7

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

sapi/cli/php_cli.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -1107,13 +1107,13 @@ static int do_cli(int argc, char **argv) /* {{{ */
11071107
case PHP_CLI_MODE_SHOW_INI_CONFIG:
11081108
{
11091109
zend_printf("Configuration File (php.ini) Path: \"%s\"\n", PHP_CONFIG_FILE_PATH);
1110-
if (php_ini_scanned_path) {
1111-
zend_printf("Loaded Configuration File: \"%s\"\n", php_ini_scanned_path);
1110+
if (php_ini_opened_path) {
1111+
zend_printf("Loaded Configuration File: \"%s\"\n", php_ini_opened_path);
11121112
} else {
11131113
zend_printf("Loaded Configuration File: (none)\n");
11141114
}
1115-
if (php_ini_opened_path) {
1116-
zend_printf("Scan for additional .ini files in: \"%s\"\n", php_ini_opened_path);
1115+
if (php_ini_scanned_path) {
1116+
zend_printf("Scan for additional .ini files in: \"%s\"\n", php_ini_scanned_path);
11171117
} else {
11181118
zend_printf("Scan for additional .ini files in: (none)\n");
11191119
}

0 commit comments

Comments
 (0)