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

nikic · nikic · commit 7066be50c025 · 2012-08-13T21:23:06.000+02:00
diff --git 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
@@ -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) {

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,10 @@`
`27`	`27`
`28`	`28`	`PHPAPI void php_print_credits(int flag TSRMLS_DC) /* {{{ */`
`29`	`29`	`{`
	`30`	`+ if (!sapi_module.phpinfo_as_text && flag & PHP_CREDITS_FULLPAGE) {`
	`31`	`+ php_print_info_htmlhead(TSRMLS_C);`
	`32`	`+ }`
	`33`	`+`
`30`	`34`	`if (!sapi_module.phpinfo_as_text) {`
`31`	`35`	`PUTS("<h1>PHP Credits</h1>\n");`
`32`	`36`	`} else {`
`@@ -119,6 +123,10 @@ PHPAPI void php_print_credits(int flag TSRMLS_DC) /* {{{ */`
`119`	`123`	`CREDIT_LINE("Windows Infrastructure", "Alex Schoenmaker");`
`120`	`124`	`php_info_print_table_end();`
`121`	`125`	`}`
	`126`	`+`
	`127`	`+ if (!sapi_module.phpinfo_as_text && flag & PHP_CREDITS_FULLPAGE) {`
	`128`	`+ PUTS("</div></body></html>\n");`
	`129`	`+ }`
`122`	`130`	`}`
`123`	`131`	`/* }}} */`
`124`	`132`
Original file line number	Diff line number	Diff line change
`@@ -881,7 +881,7 @@ PHPAPI void php_print_info(int flag TSRMLS_DC)`
`881`	`881`
`882`	`882`	`if ((flag & PHP_INFO_CREDITS) && !sapi_module.phpinfo_as_text) {`
`883`	`883`	`php_info_print_hr();`
`884`		`- php_print_credits(PHP_CREDITS_ALL TSRMLS_CC);`
	`884`	`+ php_print_credits(PHP_CREDITS_ALL & ~PHP_CREDITS_FULLPAGE TSRMLS_CC);`
`885`	`885`	`}`
`886`	`886`
`887`	`887`	`if (flag & PHP_INFO_LICENSE) {`