com php-src: OK, bye bye JavaScript, let's just include credits before license: ext/standard/info.c
| From: | Stanislav Malyshev | Date: | Sun, 22 Jul 2012 23:11:00 +0000 |
| Subject: | com php-src: OK, bye bye JavaScript, let's just include credits before license: ext/standard/info.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-69781@lists.php.net to get a copy of this message | ||
Commit: b1a997e2a25d1f1422a237e12cff19a70a8eb317
Author: Andrew Faulds <ajfweb@googlemail.com> Mon, 23 Jul 2012 00:11:00 +0100
Parents: c7c2fb015875979210b801b3e00adef23d3079c2
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b1a997e2a25d1f1422a237e12cff19a70a8eb317
Log:
OK, bye bye JavaScript, let's just include credits before license
Changed paths:
M ext/standard/info.c
Diff:
diff --git a/ext/standard/info.c b/ext/standard/info.c
index 83126c1..11da068 100644
--- a/ext/standard/info.c
+++ b/ext/standard/info.c
@@ -797,32 +797,6 @@ PHPAPI void php_print_info(int flag TSRMLS_DC)
efree(php_uname);
}
- if ((flag & PHP_INFO_CREDITS) && !sapi_module.phpinfo_as_text) {
- php_info_print_hr();
- php_info_print("<script>(function () {\n");
- php_info_print(" 'use strict';\n");
- php_info_print(" window.onload = function () {\n");
- php_info_print(" var credits, reveal;\n");
- php_info_print("\n");
- php_info_print(" credits = document.getElementById('credits');\n");
- php_info_print(" reveal =
document.getElementById('revealcredits');\n");
- php_info_print("\n");
- php_info_print(" credits.style.display = 'none';\n");
- php_info_print(" reveal.style.display = 'block';\n");
- php_info_print(" reveal.onclick = function () {\n");
- php_info_print(" credits.style.display = 'block';\n");
- php_info_print(" reveal.style.display = 'none';\n");
- php_info_print(" };\n");
- php_info_print(" };\n");
- php_info_print("}());</script>\n");
- php_info_print("<h1><a id=\"revealcredits\" href=\"#credits\"
style=\"display: none;\">");
- php_info_print("PHP Credits");
- php_info_print("</a></h1>\n");
- php_info_print("<div id=\"credits\">\n");
- php_print_credits(PHP_CREDITS_ALL, TSRMLS_C);
- php_info_print("</div>\n");
- }
-
zend_ini_sort_entries(TSRMLS_C);
if (flag & PHP_INFO_CONFIGURATION) {
@@ -904,6 +878,12 @@ PHPAPI void php_print_info(int flag TSRMLS_DC)
php_info_print_table_end();
}
+
+ if ((flag & PHP_INFO_CREDITS) && !sapi_module.phpinfo_as_text) {
+ php_info_print_hr();
+ php_print_credits(PHP_CREDITS_ALL, TSRMLS_C);
+ }
+
if (flag & PHP_INFO_LICENSE) {
if (!sapi_module.phpinfo_as_text) {
SECTION("PHP License");
@@ -937,6 +917,7 @@ PHPAPI void php_print_info(int flag TSRMLS_DC)
php_info_print("questions about PHP licensing, please contact license@php.net.\n");
}
}
+
if (!sapi_module.phpinfo_as_text) {
php_info_print("</div></body></html>");
}