com php-src: Fix phpcredits() BC after remove Logo GUIDs: ext/standard/credits.c ext/standard/info.c
| From: | Nikita Popov | Date: | Thu, 09 Aug 2012 13:43:59 +0000 |
| Subject: | com php-src: Fix phpcredits() BC after remove Logo GUIDs: ext/standard/credits.c ext/standard/info.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-69821@lists.php.net to get a copy of this message | ||
Commit: 3d4169d751d443313da9f6299d1aff3d9fdc7ed0
Author: Reeze Xia <reeze.xia@gmail.com> Thu, 9 Aug 2012 21:43:59 +0800
Parents: 1190bc440be0ab8ef6703dc9cb1dc4d64bf538f0
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3d4169d751d443313da9f6299d1aff3d9fdc7ed0
Log:
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.
Changed paths:
M ext/standard/credits.c
M ext/standard/info.c
Diff:
diff --git a/ext/standard/credits.c b/ext/standard/credits.c
index 0f5d6d7..e87cdca 100644
--- 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 089f515..beb1477 100644
--- 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) {