diff --git a/src/wp-admin/css/common.css b/src/wp-admin/css/common.css
index eb7e02ca0c..ca61c32452 100644
--- a/src/wp-admin/css/common.css
+++ b/src/wp-admin/css/common.css
@@ -2817,6 +2817,11 @@ div.action-links {
font-size: 13px;
}
+/* For non-js plugin installation screen ticket #36430. */
+.update-php .button.button-primary {
+ margin-right: 1em;
+}
+
@media screen and ( max-width: 771px ) {
#plugin-information-title.with-banner {
height: 100px;
diff --git a/src/wp-admin/includes/class-plugin-installer-skin.php b/src/wp-admin/includes/class-plugin-installer-skin.php
index 34b202035e..6c55455239 100644
--- a/src/wp-admin/includes/class-plugin-installer-skin.php
+++ b/src/wp-admin/includes/class-plugin-installer-skin.php
@@ -52,12 +52,12 @@ class Plugin_Installer_Skin extends WP_Upgrader_Skin {
$from = isset($_GET['from']) ? wp_unslash( $_GET['from'] ) : 'plugins';
if ( 'import' == $from )
- $install_actions['activate_plugin'] = '' . __( 'Activate Plugin & Run Importer' ) . '';
+ $install_actions['activate_plugin'] = '' . __( 'Activate Plugin & Run Importer' ) . '';
else
- $install_actions['activate_plugin'] = '' . __( 'Activate Plugin' ) . '';
+ $install_actions['activate_plugin'] = '' . __( 'Activate Plugin' ) . '';
if ( is_multisite() && current_user_can( 'manage_network_plugins' ) ) {
- $install_actions['network_activate'] = '' . __( 'Network Activate' ) . '';
+ $install_actions['network_activate'] = '' . __( 'Network Activate' ) . '';
unset( $install_actions['activate_plugin'] );
}
@@ -90,7 +90,8 @@ class Plugin_Installer_Skin extends WP_Upgrader_Skin {
*/
$install_actions = apply_filters( 'install_plugin_complete_actions', $install_actions, $this->api, $plugin_file );
- if ( ! empty($install_actions) )
- $this->feedback(implode(' | ', (array)$install_actions));
+ if ( ! empty( $install_actions ) ) {
+ $this->feedback( implode( ' ', (array) $install_actions ) );
+ }
}
}