com php-src: Removed now-unnecessary expose_php checks fo r logo: ext/standard/info.c
| From: | Stanislav Malyshev | Date: | Sat, 14 Jul 2012 22:20:45 +0000 |
| Subject: | com php-src: Removed now-unnecessary expose_php checks fo r logo: ext/standard/info.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-69783@lists.php.net to get a copy of this message | ||
Commit: ee6540ad092ce2f2aedb2e677b292b58acdca9be
Author: Andrew Faulds <ajfweb@googlemail.com> Sat, 14 Jul 2012 23:20:45 +0100
Parents: 92d2aeb234146978ef1175767579ce3eb30d37fd
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ee6540ad092ce2f2aedb2e677b292b58acdca9be
Log:
Removed now-unnecessary expose_php checks for logo
Changed paths:
M ext/standard/info.c
Diff:
diff --git a/ext/standard/info.c b/ext/standard/info.c
index b27468e..a63fd4c 100644
--- a/ext/standard/info.c
+++ b/ext/standard/info.c
@@ -652,7 +652,6 @@ PHPAPI void php_print_info(int flag TSRMLS_DC)
{
char **env, *tmp1, *tmp2;
char *php_uname;
- int expose_php = INI_INT("expose_php");
if (!sapi_module.phpinfo_as_text) {
php_print_info_htmlhead(TSRMLS_C);
@@ -670,7 +669,7 @@ PHPAPI void php_print_info(int flag TSRMLS_DC)
php_info_print_box_start(1);
}
- if (expose_php && !sapi_module.phpinfo_as_text) {
+ if (!sapi_module.phpinfo_as_text) {
time_t the_time;
struct tm *ta, tmbuf;
@@ -783,7 +782,7 @@ PHPAPI void php_print_info(int flag TSRMLS_DC)
/* Zend Engine */
php_info_print_box_start(0);
- if (expose_php && !sapi_module.phpinfo_as_text) {
+ if (!sapi_module.phpinfo_as_text) {
php_info_print("<a href=\"http://www.zend.com/\"><img border=\"0\"
src=\"");
php_info_print(ZEND_LOGO_DATA_URI "\" alt=\"Zend logo\"
/></a>\n");
}
@@ -798,7 +797,7 @@ PHPAPI void php_print_info(int flag TSRMLS_DC)
efree(php_uname);
}
- if ((flag & PHP_INFO_CREDITS) && expose_php && !sapi_module.phpinfo_as_text)
{
+ 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");