diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2021-02-22 14:33:49 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2021-02-22 14:34:21 +0100 |
| commit | 1d2bbce532a4383210e97ce6b00e210ef2cbaae7 (patch) | |
| tree | 896d90e9514d80a68980e9338b21ca83ed1d8491 /ext/standard | |
| parent | 6dcd640f35a88bfc0f07b056ef47e2ff9c366ffc (diff) | |
| parent | 073b6ea818286fe838097d49f92ae379d5f217f0 (diff) | |
| download | php-git-1d2bbce532a4383210e97ce6b00e210ef2cbaae7.tar.gz | |
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix #80771: phpinfo(INFO_CREDITS) displays nothing in CLI
Diffstat (limited to 'ext/standard')
| -rw-r--r-- | ext/standard/info.c | 2 | ||||
| -rw-r--r-- | ext/standard/tests/general_functions/bug80771.phpt | 16 |
2 files changed, 17 insertions, 1 deletions
diff --git a/ext/standard/info.c b/ext/standard/info.c index 153cb6cde0..0e461117f0 100644 --- a/ext/standard/info.c +++ b/ext/standard/info.c @@ -995,7 +995,7 @@ PHPAPI ZEND_COLD void php_print_info(int flag) } - if ((flag & PHP_INFO_CREDITS) && !sapi_module.phpinfo_as_text) { + if (flag & PHP_INFO_CREDITS) { php_info_print_hr(); php_print_credits(PHP_CREDITS_ALL & ~PHP_CREDITS_FULLPAGE); } diff --git a/ext/standard/tests/general_functions/bug80771.phpt b/ext/standard/tests/general_functions/bug80771.phpt new file mode 100644 index 0000000000..a8c9e7b542 --- /dev/null +++ b/ext/standard/tests/general_functions/bug80771.phpt @@ -0,0 +1,16 @@ +--TEST-- +Bug #80771 (phpinfo(INFO_CREDITS) displays nothing in CLI) +--FILE-- +<?php +ob_start(); +phpinfo(INFO_CREDITS); +$info = ob_get_clean(); + +ob_start(); +phpcredits(); +$credits = ob_get_clean(); + +var_dump(strpos($info, $credits) !== false); +?> +--EXPECT-- +bool(true) |