diff --git a/src/wp-admin/includes/class-wp-plugins-list-table.php b/src/wp-admin/includes/class-wp-plugins-list-table.php index e96445b7710a7..e0dc1b8e3943a 100644 --- a/src/wp-admin/includes/class-wp-plugins-list-table.php +++ b/src/wp-admin/includes/class-wp-plugins-list-table.php @@ -1567,18 +1567,62 @@ protected function add_dependencies_to_dependent_plugin_row( $dependent ) { return; } - $links = array(); - foreach ( $dependency_names as $slug => $name ) { - $links[] = $this->get_dependency_view_details_link( $name, $slug ); - } + $requires = null; + + if ( ! empty( $dependency_names ) ) { - $is_active = is_multisite() ? is_plugin_active_for_network( $dependent ) : is_plugin_active( $dependent ); - $comma = wp_get_list_item_separator(); - $requires = sprintf( - /* translators: %s: List of dependency names. */ - __( 'Requires: %s' ), - implode( $comma, $links ) - ); + $links = array(); + + foreach ( $dependency_names as $slug => $name ) { + $link = $this->get_dependency_view_details_link( $name, $slug ); + + $dependency_file = WP_Plugin_Dependencies::get_dependency_filepath( $slug ); + + $is_installed = false; + $is_active = false; + + if ( $dependency_file ) { + $is_installed = true; + $is_active = is_multisite() + ? is_plugin_active_for_network( $dependency_file ) || is_plugin_active( $dependency_file ) + : is_plugin_active( $dependency_file ); + } + + if ( ! $is_installed ) { + $link .= sprintf( + ' %s + %s', + __( '(not installed)' ), + __( 'Not installed' ) + ); + } elseif ( $is_active ) { + $link .= sprintf( + ' %s + + %s', + __( '(installed, active)' ), + __( 'Installed and active' ) + ); + } else { + $link .= sprintf( + ' %s + + %s', + __( '(installed, inactive)' ), + __( 'Installed but inactive' ) + ); + } + + $links[] = $link; + } + + $comma = wp_get_list_item_separator(); + $requires = sprintf( + /* translators: %s: List of dependency names. */ + __( 'Requires: %s' ), + implode( $comma, $links ) + ); + } $notice = ''; $error_message = ''; diff --git a/src/wp-admin/options.php b/src/wp-admin/options.php index 8348b24c8e941..cfaf7d080be21 100644 --- a/src/wp-admin/options.php +++ b/src/wp-admin/options.php @@ -416,6 +416,11 @@ $class = 'all-options disabled'; } } else { + if ( in_array( $option->option_name, array( 'siteurl', 'home' ), true ) && defined( 'WP_' . strtoupper( $option->option_name ) ) ) { + // If a setting is defined in wp-config.php, disable the respective field. + $disabled = true; + } + $value = $option->option_value; $options_to_update[] = $option->option_name; $class = 'all-options'; diff --git a/src/wp-includes/script-loader.php b/src/wp-includes/script-loader.php index f6fe4d648c00c..6148ed028303c 100644 --- a/src/wp-includes/script-loader.php +++ b/src/wp-includes/script-loader.php @@ -1002,7 +1002,7 @@ function wp_default_scripts( $scripts ) { 'file_cancelled' => __( 'File canceled.' ), 'upload_stopped' => __( 'Upload stopped.' ), 'dismiss' => __( 'Dismiss' ), - 'crunching' => __( 'Crunching…' ), + 'processing' => __( 'Processing…' ), 'deleted' => __( 'moved to the Trash.' ), /* translators: %s: File name. */ 'error_uploading' => __( '“%s” has failed to upload.' ),