Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-11-05 02:10:45 +01:00
Code Issues Projects Releases Wiki Activity

PHP 7.3 Compatibility: Fix compact related notices.

Browse Source 
In PHP 7.3, the `compact()` function has been changed to issue an `E_NOTICE` level error if a passed string refers to an unset variable. In previous versions of PHP, this notice was silently skipped. This fixes a few more instances of unset variables in the WordPress admin.

The full RFC can be viewed here: https://wiki.php.net/rfc/compact.

See #44416.
Fixes #45483.
Built from https://develop.svn.wordpress.org/branches/5.0@44185


git-svn-id: http://core.svn.wordpress.org/branches/5.0@44015 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
desrosj 2018-12-15 11:01:25 +00:00
parent 6137ee183b
commit 15db443250
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
wp-admin/includes/plugin-install.php
View File

@ -394,6 +394,7 @@ function install_plugin_install_status($api, $loop = false) {
$status = 'install'; $status = 'install';
$url = false; $url = false;
$update_file = false; $update_file = false;
$version = '';
/* /*
* Check to see if this plugin is known to be installed, * Check to see if this plugin is known to be installed,

6
wp-admin/includes/post.php
View File

@ -1029,18 +1029,24 @@ function wp_edit_posts_query( $q = false ) {
$post_type = 'post'; $post_type = 'post';
$avail_post_stati = get_available_post_statuses($post_type); $avail_post_stati = get_available_post_statuses($post_type);
$post_status = '';
$perm = '';
if ( isset($q['post_status']) && in_array( $q['post_status'], $post_stati ) ) { if ( isset($q['post_status']) && in_array( $q['post_status'], $post_stati ) ) {
$post_status = $q['post_status']; $post_status = $q['post_status'];
$perm = 'readable'; $perm = 'readable';
} }
$orderby = '';
if ( isset( $q['orderby'] ) ) { if ( isset( $q['orderby'] ) ) {
$orderby = $q['orderby']; $orderby = $q['orderby'];
} elseif ( isset( $q['post_status'] ) && in_array( $q['post_status'], array( 'pending', 'draft' ) ) ) { } elseif ( isset( $q['post_status'] ) && in_array( $q['post_status'], array( 'pending', 'draft' ) ) ) {
$orderby = 'modified'; $orderby = 'modified';
} }
$order = '';
if ( isset( $q['order'] ) ) { if ( isset( $q['order'] ) ) {
$order = $q['order']; $order = $q['order'];
} elseif ( isset( $q['post_status'] ) && 'pending' == $q['post_status'] ) { } elseif ( isset( $q['post_status'] ) && 'pending' == $q['post_status'] ) {

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.0.2-alpha-44183'; $wp_version = '5.0.2-alpha-44185';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.