Merge remote-tracking branch 'reeze/fix-phpcredits-bc'

This commit is contained in:
Nikita Popov 2012-08-13 21:23:06 +02:00
commit 7066be50c0
2 changed files with 9 additions and 1 deletions

View File

@ -27,6 +27,10 @@
PHPAPI void php_print_credits(int flag TSRMLS_DC) /* {{{ */
{
if (!sapi_module.phpinfo_as_text && flag & PHP_CREDITS_FULLPAGE) {
php_print_info_htmlhead(TSRMLS_C);
}
if (!sapi_module.phpinfo_as_text) {
PUTS("<h1>PHP Credits</h1>\n");
} else {
@ -119,6 +123,10 @@ PHPAPI void php_print_credits(int flag TSRMLS_DC) /* {{{ */
CREDIT_LINE("Windows Infrastructure", "Alex Schoenmaker");
php_info_print_table_end();
}
if (!sapi_module.phpinfo_as_text && flag & PHP_CREDITS_FULLPAGE) {
PUTS("</div></body></html>\n");
}
}
/* }}} */

View File

@ -881,7 +881,7 @@ PHPAPI void php_print_info(int flag TSRMLS_DC)
if ((flag & PHP_INFO_CREDITS) && !sapi_module.phpinfo_as_text) {
php_info_print_hr();
php_print_credits(PHP_CREDITS_ALL TSRMLS_CC);
php_print_credits(PHP_CREDITS_ALL & ~PHP_CREDITS_FULLPAGE TSRMLS_CC);
}
if (flag & PHP_INFO_LICENSE) {