diff --git a/wp-admin/includes/class-wp-plugins-list-table.php b/wp-admin/includes/class-wp-plugins-list-table.php
index 7073e79051..565cb4b951 100644
--- a/wp-admin/includes/class-wp-plugins-list-table.php
+++ b/wp-admin/includes/class-wp-plugins-list-table.php
@@ -598,16 +598,16 @@ class WP_Plugins_List_Table extends WP_List_Table {
if ( $is_active ) {
if ( current_user_can( 'manage_network_plugins' ) ) {
/* translators: %s: plugin name */
- $actions['deactivate'] = '' . __( 'Network Deactivate' ) . '';
+ $actions['deactivate'] = '' . __( 'Network Deactivate' ) . '';
}
} else {
if ( current_user_can( 'manage_network_plugins' ) ) {
/* translators: %s: plugin name */
- $actions['activate'] = '' . __( 'Network Activate' ) . '';
+ $actions['activate'] = '' . __( 'Network Activate' ) . '';
}
if ( current_user_can( 'delete_plugins' ) && ! is_plugin_active( $plugin_file ) ) {
/* translators: %s: plugin name */
- $actions['delete'] = '' . __( 'Delete' ) . '';
+ $actions['delete'] = '' . __( 'Delete' ) . '';
}
}
} else {
@@ -622,17 +622,17 @@ class WP_Plugins_List_Table extends WP_List_Table {
} elseif ( $is_active ) {
if ( current_user_can( 'deactivate_plugin', $plugin_file ) ) {
/* translators: %s: plugin name */
- $actions['deactivate'] = '' . __( 'Deactivate' ) . '';
+ $actions['deactivate'] = '' . __( 'Deactivate' ) . '';
}
} else {
if ( current_user_can( 'activate_plugin', $plugin_file ) ) {
/* translators: %s: plugin name */
- $actions['activate'] = '' . __( 'Activate' ) . '';
+ $actions['activate'] = '' . __( 'Activate' ) . '';
}
if ( ! is_multisite() && current_user_can( 'delete_plugins' ) ) {
/* translators: %s: plugin name */
- $actions['delete'] = '' . __( 'Delete' ) . '';
+ $actions['delete'] = '' . __( 'Delete' ) . '';
}
} // end if $is_active
diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index 4846fcd906..7d5e0536f5 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -772,7 +772,7 @@ function page_template_dropdown( $default = '', $post_type = 'page' ) {
ksort( $templates );
foreach ( array_keys( $templates ) as $template ) {
$selected = selected( $default, $templates[ $template ], false );
- echo "\n\t";
+ echo "\n\t";
}
}
diff --git a/wp-admin/plugin-editor.php b/wp-admin/plugin-editor.php
index 9816a5d48c..14d2b65039 100644
--- a/wp-admin/plugin-editor.php
+++ b/wp-admin/plugin-editor.php
@@ -37,11 +37,11 @@ if ( empty( $plugins ) ) {
$file = '';
$plugin = '';
if ( isset( $_REQUEST['file'] ) ) {
- $file = sanitize_text_field( $_REQUEST['file'] );
+ $file = wp_unslash( $_REQUEST['file'] );
}
if ( isset( $_REQUEST['plugin'] ) ) {
- $plugin = sanitize_text_field( $_REQUEST['plugin'] );
+ $plugin = wp_unslash( $_REQUEST['plugin'] );
}
if ( empty( $plugin ) ) {
@@ -107,10 +107,10 @@ if ( isset( $_REQUEST['action'] ) && 'update' === $_REQUEST['action'] ) {
}
if ( ( ! empty( $_GET['networkwide'] ) && ! is_plugin_active_for_network( $file ) ) || ! is_plugin_active( $file ) ) {
- activate_plugin( $plugin, "plugin-editor.php?file=$file&phperror=1", ! empty( $_GET['networkwide'] ) );
+ activate_plugin( $plugin, "plugin-editor.php?file=" . urlencode( $file ) . "&phperror=1", ! empty( $_GET['networkwide'] ) );
} // we'll override this later if the plugin can be included without fatal error
- wp_redirect( self_admin_url("plugin-editor.php?file=$file&plugin=$plugin&a=te&scrollto=$scrollto") );
+ wp_redirect( self_admin_url( 'plugin-editor.php?file=' . urlencode( $file ) . '&plugin=' . urlencode( $plugin ) . "&a=te&scrollto=$scrollto" ) );
exit;
}
@@ -242,18 +242,18 @@ if ( isset( $_REQUEST['action'] ) && 'update' === $_REQUEST['action'] ) {
if ( is_plugin_active( $plugin ) ) {
if ( is_writeable( $real_file ) ) {
/* translators: %s: plugin file name */
- echo sprintf( __( 'Editing %s (active)' ), '' . $file . '' );
+ echo sprintf( __( 'Editing %s (active)' ), '' . esc_html( $file ) . '' );
} else {
/* translators: %s: plugin file name */
- echo sprintf( __( 'Browsing %s (active)' ), '' . $file . '' );
+ echo sprintf( __( 'Browsing %s (active)' ), '' . esc_html( $file ) . '' );
}
} else {
if ( is_writeable( $real_file ) ) {
/* translators: %s: plugin file name */
- echo sprintf( __( 'Editing %s (inactive)' ), '' . $file . '' );
+ echo sprintf( __( 'Editing %s (inactive)' ), '' . esc_html( $file ) . '' );
} else {
/* translators: %s: plugin file name */
- echo sprintf( __( 'Browsing %s (inactive)' ), '' . $file . '' );
+ echo sprintf( __( 'Browsing %s (inactive)' ), '' . esc_html( $file ) . '' );
}
}
?>
@@ -298,7 +298,7 @@ foreach ( $plugin_files as $plugin_file ) :
continue;
}
?>
-
>
+ >
diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php
index e19f5849e9..d547269462 100644
--- a/wp-admin/plugins.php
+++ b/wp-admin/plugins.php
@@ -17,7 +17,7 @@ $pagenum = $wp_list_table->get_pagenum();
$action = $wp_list_table->current_action();
-$plugin = isset($_REQUEST['plugin']) ? $_REQUEST['plugin'] : '';
+$plugin = isset($_REQUEST['plugin']) ? wp_unslash( $_REQUEST['plugin'] ) : '';
$s = isset($_REQUEST['s']) ? urlencode( wp_unslash( $_REQUEST['s'] ) ) : '';
// Clean up request URI from temporary args for screen options/paging uri's to work as expected.
@@ -40,10 +40,10 @@ if ( $action ) {
check_admin_referer('activate-plugin_' . $plugin);
- $result = activate_plugin($plugin, self_admin_url('plugins.php?error=true&plugin=' . $plugin), is_network_admin() );
+ $result = activate_plugin($plugin, self_admin_url('plugins.php?error=true&plugin=' . urlencode( $plugin ) ), is_network_admin() );
if ( is_wp_error( $result ) ) {
if ( 'unexpected_output' == $result->get_error_code() ) {
- $redirect = self_admin_url('plugins.php?error=true&charsout=' . strlen($result->get_error_data()) . '&plugin=' . $plugin . "&plugin_status=$status&paged=$page&s=$s");
+ $redirect = self_admin_url('plugins.php?error=true&charsout=' . strlen($result->get_error_data()) . '&plugin=' . urlencode( $plugin ) . "&plugin_status=$status&paged=$page&s=$s");
wp_redirect(add_query_arg('_error_nonce', wp_create_nonce('plugin-activation-error_' . $plugin), $redirect));
exit;
} else {
@@ -74,7 +74,7 @@ if ( $action ) {
check_admin_referer('bulk-plugins');
- $plugins = isset( $_POST['checked'] ) ? (array) $_POST['checked'] : array();
+ $plugins = isset( $_POST['checked'] ) ? (array) wp_unslash( $_POST['checked'] ) : array();
if ( is_network_admin() ) {
foreach ( $plugins as $i => $plugin ) {
@@ -127,9 +127,9 @@ if ( $action ) {
check_admin_referer( 'bulk-plugins' );
if ( isset( $_GET['plugins'] ) )
- $plugins = explode( ',', $_GET['plugins'] );
+ $plugins = explode( ',', wp_unslash( $_GET['plugins'] ) );
elseif ( isset( $_POST['checked'] ) )
- $plugins = (array) $_POST['checked'];
+ $plugins = (array) wp_unslash( $_POST['checked'] );
else
$plugins = array();
@@ -205,7 +205,7 @@ if ( $action ) {
check_admin_referer('bulk-plugins');
- $plugins = isset( $_POST['checked'] ) ? (array) $_POST['checked'] : array();
+ $plugins = isset( $_POST['checked'] ) ? (array) wp_unslash( $_POST['checked'] ) : array();
// Do not deactivate plugins which are already deactivated.
if ( is_network_admin() ) {
$plugins = array_filter( $plugins, 'is_plugin_active_for_network' );
@@ -250,7 +250,7 @@ if ( $action ) {
check_admin_referer('bulk-plugins');
//$_POST = from the plugin form; $_GET = from the FTP details screen.
- $plugins = isset( $_REQUEST['checked'] ) ? (array) $_REQUEST['checked'] : array();
+ $plugins = isset( $_REQUEST['checked'] ) ? (array) wp_unslash( $_REQUEST['checked'] ) : array();
if ( empty( $plugins ) ) {
wp_redirect( self_admin_url("plugins.php?plugin_status=$status&paged=$page&s=$s") );
exit;
@@ -384,7 +384,7 @@ if ( $action ) {
default:
if ( isset( $_POST['checked'] ) ) {
check_admin_referer('bulk-plugins');
- $plugins = isset( $_POST['checked'] ) ? (array) $_POST['checked'] : array();
+ $plugins = isset( $_POST['checked'] ) ? (array) wp_unslash( $_POST['checked'] ) : array();
$sendback = wp_get_referer();
/** This action is documented in wp-admin/edit-comments.php */
diff --git a/wp-admin/theme-editor.php b/wp-admin/theme-editor.php
index 2fb8d20de5..cefe25648f 100644
--- a/wp-admin/theme-editor.php
+++ b/wp-admin/theme-editor.php
@@ -132,7 +132,7 @@ if ( empty( $file ) ) {
$relative_file = 'style.css';
$file = $allowed_files['style.css'];
} else {
- $relative_file = $file;
+ $relative_file = wp_unslash( $file );
$file = $theme->get_stylesheet_directory() . '/' . $relative_file;
}
@@ -195,10 +195,12 @@ default:
(' . $file_show . ')';
+$description = esc_html( $file_description );
+if ( $file_description != $file_show ) {
+ $description .= ' (' . esc_html( $file_show ) . ')';
+}
?>
@@ -269,9 +271,9 @@ if ( $allowed_files ) :
echo "\t
\n";
}
- $file_description = get_file_description( $filename );
+ $file_description = esc_html( get_file_description( $filename ) );
if ( $filename !== basename( $absolute_filename ) || $file_description !== $filename ) {
- $file_description .= '
(' . $filename . ')';
+ $file_description .= '
(' . esc_html( $filename ) . ')';
}
if ( $absolute_filename === $file ) {
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 814949ba74..236bdfe44c 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
-$wp_version = '4.9-alpha-41398';
+$wp_version = '4.9-alpha-41399';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.