diff --git a/UPGRADING b/UPGRADING index 8b52be26d75c0..646419d7b8f25 100755 --- a/UPGRADING +++ b/UPGRADING @@ -21,6 +21,9 @@ PHP X.Y UPGRADE NOTES ======================================== - Drop Windows XP and 2003 support. (Pierre) +- php_logo_guid(), php_egg_logo_guid(), php_real_logo_guid() and + zend_logo_guid() have been removed +- Removal of Logo GUIDs ======================================== 2. New Features @@ -89,6 +92,8 @@ PHP X.Y UPGRADE NOTES - IntlDateFormatter::setTimeZoneID() and datefmt_set_timezone_id() are deprecated. Use IntlDateFormatter::setTimeZone() or datefmt_set_timezone() instead. +- php_logo_guid(), php_egg_logo_guid(), php_real_logo_guid() and + zend_logo_guid() have been removed ======================================== 5. New Functions @@ -222,3 +227,5 @@ PHP X.Y UPGRADE NOTES ======================================== 11. Other Changes ======================================== + +- Logo GUIDs will no longer work diff --git a/configure.in b/configure.in index 96febdd9000e9..529ff58eb8758 100644 --- a/configure.in +++ b/configure.in @@ -1443,7 +1443,7 @@ PHP_ADD_SOURCES(main, main.c snprintf.c spprintf.c php_sprintf.c \ fopen_wrappers.c alloca.c php_scandir.c \ php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \ strlcat.c mergesort.c reentrancy.c php_variables.c php_ticks.c \ - network.c php_open_temporary_file.c php_logos.c \ + network.c php_open_temporary_file.c \ output.c getopt.c) PHP_ADD_SOURCES(main/streams, streams.c cast.c memory.c filter.c \ diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 771108b8d83db..690356c61b226 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -1550,18 +1550,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phpcredits, 0, 0, 0) ZEND_ARG_INFO(0, flag) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO(arginfo_php_logo_guid, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO(arginfo_php_real_logo_guid, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO(arginfo_php_egg_logo_guid, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO(arginfo_zend_logo_guid, 0) -ZEND_END_ARG_INFO() - ZEND_BEGIN_ARG_INFO(arginfo_php_sapi_name, 0) ZEND_END_ARG_INFO() @@ -2723,10 +2711,6 @@ const zend_function_entry basic_functions[] = { /* {{{ */ PHP_FE(phpinfo, arginfo_phpinfo) PHP_FE(phpversion, arginfo_phpversion) PHP_FE(phpcredits, arginfo_phpcredits) - PHP_FE(php_logo_guid, arginfo_php_logo_guid) - PHP_FE(php_real_logo_guid, arginfo_php_real_logo_guid) - PHP_FE(php_egg_logo_guid, arginfo_php_egg_logo_guid) - PHP_FE(zend_logo_guid, arginfo_zend_logo_guid) PHP_FE(php_sapi_name, arginfo_php_sapi_name) PHP_FE(php_uname, arginfo_php_uname) PHP_FE(php_ini_scanned_files, arginfo_php_ini_scanned_files) diff --git a/ext/standard/credits.c b/ext/standard/credits.c index e87cdcad8be99..0f5d6d735119f 100644 --- a/ext/standard/credits.c +++ b/ext/standard/credits.c @@ -27,10 +27,6 @@ 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("