Commit 4d35ce5

committed

Fix swapped variables

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 4d35ce5Copy full SHA for 4d35ce5

File tree

1 file changed

-4

lines changed

sapi/cli
- php_cli.c

1 file changed

-4

lines changed

`‎sapi/cli/php_cli.c‎`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1107,13 +1107,13 @@ static int do_cli(int argc, char *argv) / {{{ */`
`1107`	`1107`	`case PHP_CLI_MODE_SHOW_INI_CONFIG:`
`1108`	`1108`	`{`
`1109`	`1109`	`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);`
`1112`	`1112`	`} else {`
`1113`	`1113`	`zend_printf("Loaded Configuration File: (none)\n");`
`1114`	`1114`	`}`
`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);`
`1117`	`1117`	`} else {`
`1118`	`1118`	`zend_printf("Scan for additional .ini files in: (none)\n");`
`1119`	`1119`	`}`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 4d35ce5

File tree

1 file changed

1 file changed

`‎sapi/cli/php_cli.c‎`

0 commit comments