Commit: c9eb64127e2d25c09672beacffdd34c8e7e3ddd2 Author: Stanislav Malyshev <s...@php.net> Sun, 5 Aug 2012 21:13:39 -0700 Parents: 1a41607d462ec2bfe9725821c541bae78282d8a5 b1a997e2a25d1f1422a237e12cff19a70a8eb317 Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c9eb64127e2d25c09672beacffdd34c8e7e3ddd2 Log: Merge branch 'pull-request/132' * pull-request/132: OK, bye bye JavaScript, let's just include credits before license Nicer (JSLint-compliant!) credits reveal JavaScript Removed now-unnecessary expose_php checks for logo Fixed small misalignment in prev commit Removed Logo GUIDs and replaced with Data URIs and div hidden with JS Changed paths: MM UPGRADING MM ext/standard/basic_functions.c MM ext/standard/info.c MM sapi/cli/php_cli_server.c Diff: diff --cc UPGRADING index 7aea61f,646419d..4fac7a8 --- a/UPGRADING +++ b/UPGRADING @@@ -21,8 -21,9 +21,11 @@@ PHP X.Y UPGRADE NOTE ======================================== - Drop Windows XP and 2003 support. (Pierre) +- All internal case insensitivity handling for class, function and constant + names is done according to ASCII rules, current locale settings are ignored. + - 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 @@@ -91,9 -92,8 +94,11 @@@ - IntlDateFormatter::setTimeZoneID() and datefmt_set_timezone_id() are deprecated. Use IntlDateFormatter::setTimeZone() or datefmt_set_timezone() instead. +- IntlDateFormatter::format() and datefmt_format() now also accept an + IntlCalendar object for formatting. +- Deprecated mcrypt_ecb() made to produce E_DEPRECATED. + - php_logo_guid(), php_egg_logo_guid(), php_real_logo_guid() and + zend_logo_guid() have been removed ======================================== 5. New Functions diff --cc ext/standard/info.c index 07e1528,11da068..089f515 --- a/ext/standard/info.c +++ b/ext/standard/info.c @@@ -893,6 -878,12 +878,12 @@@ PHPAPI void php_print_info(int flag TSR 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); ++ php_print_credits(PHP_CREDITS_ALL TSRMLS_CC); + } + if (flag & PHP_INFO_LICENSE) { if (!sapi_module.phpinfo_as_text) { SECTION("PHP License"); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
