- MFH: Remove HTML fragments from phpcredits() in CLI mode

Author: johannes

ext/standard/credits.c

@@ -21,18 +21,23 @@
 
 #include "php.h"
 #include "info.h"
+#include "SAPI.h"
 
 #define CREDIT_LINE(module, authors) php_info_print_table_row(2, module, authors)
 
 /* {{{ php_print_credits
  */
 PHPAPI void php_print_credits(int flag TSRMLS_DC)
 {
-	if (flag & PHP_CREDITS_FULLPAGE) {
+	if (!sapi_module.phpinfo_as_text && flag & PHP_CREDITS_FULLPAGE) {
 		php_print_info_htmlhead(TSRMLS_C);
 	}
 
-	PUTS("<h1>PHP Credits</h1>\n");
+	if (!sapi_module.phpinfo_as_text) {
+		PUTS("<h1>PHP Credits</h1>\n");
+	} else {
+		PUTS("PHP Credits\n");
+	}
 
 	if (flag & PHP_CREDITS_GROUP) {
 		/* Group */
@@ -46,7 +51,11 @@ PHPAPI void php_print_credits(int flag TSRMLS_DC)
 	if (flag & PHP_CREDITS_GENERAL) {
 		/* Design & Concept */
 		php_info_print_table_start();
-		php_info_print_table_header(1, "Language Design &amp; Concept");
+		if (!sapi_module.phpinfo_as_text) {
+			php_info_print_table_header(1, "Language Design &amp; Concept");
+		} else {
+			php_info_print_table_header(1, "Language Design & Concept");
+		}
 		php_info_print_table_row(1, "Andi Gutmans, Rasmus Lerdorf, Zeev Suraski");
 		php_info_print_table_end();
 
@@ -109,7 +118,7 @@ PHPAPI void php_print_credits(int flag TSRMLS_DC)
 		php_info_print_table_end();
 	}
 
-	if (flag & PHP_CREDITS_FULLPAGE) {
+	if (!sapi_module.phpinfo_as_text && flag & PHP_CREDITS_FULLPAGE) {
 		PUTS("</div></body></html>\n");
 	}
 }