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

diff --git a/ext/standard/credits.c b/ext/standard/credits.c
index 142c7f8c301634bbf37984c53e93361da3b9e9ff..613c0b2adbedc1b8d37b9b34543bf95b6efdd964 100644 (file)
--- a/ext/standard/credits.c
+++ b/ext/standard/credits.c
@@ -21,6 +21,7 @@
 
 #include "php.h"
 #include "info.h"
+#include "SAPI.h"
 
 #define CREDIT_LINE(module, authors) php_info_print_table_row(2, module, authors)
 
@@ -30,11 +31,15 @@ PHPAPI void php_print_credits(int flag)
 {
        TSRMLS_FETCH();
 
-       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 */
@@ -48,7 +53,11 @@ PHPAPI void php_print_credits(int flag)
        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();
 
@@ -110,7 +119,7 @@ PHPAPI void php_print_credits(int flag)
                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");
        }
 }