From 0314e29667532c17c3fc2ec5d8b78c856e7497fd Mon Sep 17 00:00:00 2001 From: Dion Hulse Date: Tue, 25 Oct 2016 03:15:30 +0000 Subject: [PATCH] Drop the requirement for the entry points to WordPress to be parsable by PHP4. Previously we ensured that the entry points to WordPress were parsable by PHP4 in order to display a friendly not-supported-php error message. However, for the last two years the main entry points have not actually parsed, and we've only added extra parse errors since it last worked in 3.9, so it's time we just remove this 'feature'. The PHP version checks are still there for PHP 5.0/5.1, and so it's inplace when we eventually drop PHP 5.2 support. See #29489. Built from https://develop.svn.wordpress.org/trunk@38899 git-svn-id: http://core.svn.wordpress.org/trunk@38842 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/index.php | 1 - wp-admin/setup-config.php | 3 --- wp-includes/load.php | 2 -- wp-includes/version.php | 2 +- wp-load.php | 2 -- wp-settings.php | 2 -- 6 files changed, 1 insertion(+), 11 deletions(-) diff --git a/wp-admin/index.php b/wp-admin/index.php index 6e31f8b718..d2d7ec889d 100644 --- a/wp-admin/index.php +++ b/wp-admin/index.php @@ -33,7 +33,6 @@ $parent_file = 'index.php'; $help = '

' . __( 'Welcome to your WordPress Dashboard! This is the screen you will see when you log in to your site, and gives you access to all the site management features of WordPress. You can get help for any screen by clicking the Help tab above the screen title.' ) . '

'; -// Not using chaining here, so as to be parseable by PHP4. $screen = get_current_screen(); $screen->add_help_tab( array( diff --git a/wp-admin/setup-config.php b/wp-admin/setup-config.php index 6c65bf8092..1404c32599 100644 --- a/wp-admin/setup-config.php +++ b/wp-admin/setup-config.php @@ -5,8 +5,6 @@ * The permissions for the base directory must allow for writing files in order * for the wp-config.php to be created using this page. * - * @internal This file must be parsable by PHP4. - * * @package WordPress * @subpackage Administration */ @@ -316,7 +314,6 @@ switch($step) { } $key = 0; - // Not a PHP5-style by-reference foreach, as this file must be parseable by PHP4. foreach ( $config_file as $line_num => $line ) { if ( '$table_prefix =' == substr( $line, 0, 16 ) ) { $config_file[ $line_num ] = '$table_prefix = \'' . addcslashes( $prefix, "\\'" ) . "';\r\n"; diff --git a/wp-includes/load.php b/wp-includes/load.php index 887a6b152a..4a3e1c3e28 100644 --- a/wp-includes/load.php +++ b/wp-includes/load.php @@ -2,8 +2,6 @@ /** * These functions are needed to load WordPress. * - * @internal This file must be parsable by PHP4. - * * @package WordPress */ diff --git a/wp-includes/version.php b/wp-includes/version.php index 5bb252554d..cdcafcf98b 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.7-alpha-38898'; +$wp_version = '4.7-alpha-38899'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. diff --git a/wp-load.php b/wp-load.php index 76dda74b76..a1a9ad6b18 100644 --- a/wp-load.php +++ b/wp-load.php @@ -13,8 +13,6 @@ * directory to allow the WordPress directory to remain * untouched. * - * @internal This file must be parsable by PHP4. - * * @package WordPress */ diff --git a/wp-settings.php b/wp-settings.php index 21cb4cda36..3347cc979e 100644 --- a/wp-settings.php +++ b/wp-settings.php @@ -5,8 +5,6 @@ * * Allows for some configuration in wp-config.php (see default-constants.php) * - * @internal This file must be parsable by PHP4. - * * @package WordPress */