Fix phpcredits() BC after remove Logo GUIDs

This test was affected: ext/standard/tests/general_functions/phpcredits2.phpt
see https://github.com/php/php-src/pull/132/files#diff-3
This makes constant PHP_CREDITS_FULLPAGE didn't functional anymore.

diff --git a/ext/standard/credits.c b/ext/standard/credits.c
index 0f5d6d735119f0641771d9087a85aee968422ee1..e87cdcad8be992de23c2e27b2e5c02099d7dc341 100644 (file)
--- a/ext/standard/credits.c
+++ b/ext/standard/credits.c
@@ -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");
+       }
 }
 /* }}} */
 

diff --git a/ext/standard/info.c b/ext/standard/info.c
index 089f515d95b9beda9e3f6aea50b5d92f7e998b3b..beb147797d91dbaff10c682c42d13138c6a2bfda 100644 (file)
--- a/ext/standard/info.c
+++ b/ext/standard/info.c
@@ -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) {