From 65eb29ad46d93e34b2bb3ee2fbe219a3c06373cf Mon Sep 17 00:00:00 2001 From: Dominik Schilling Date: Thu, 7 Jul 2016 10:53:28 +0000 Subject: [PATCH] Import: Merge two similar strings. Props ramiy. See #34521. Built from https://develop.svn.wordpress.org/trunk@37998 git-svn-id: http://core.svn.wordpress.org/trunk@37939 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/admin.php | 5 +++-- wp-admin/import.php | 5 +++-- wp-includes/version.php | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/wp-admin/admin.php b/wp-admin/admin.php index 5ea6b4ef4f..3fabd8751e 100644 --- a/wp-admin/admin.php +++ b/wp-admin/admin.php @@ -271,8 +271,9 @@ if ( isset($plugin_page) ) { $importer = $_GET['import']; - if ( ! current_user_can('import') ) - wp_die(__('Sorry, you are not allowed to import.')); + if ( ! current_user_can( 'import' ) ) { + wp_die( __( 'Sorry, you are not allowed to import content.' ) ); + } if ( validate_file($importer) ) { wp_redirect( admin_url( 'import.php?invalid=' . $importer ) ); diff --git a/wp-admin/import.php b/wp-admin/import.php index 663a9fb884..962db681a2 100644 --- a/wp-admin/import.php +++ b/wp-admin/import.php @@ -11,8 +11,9 @@ define('WP_LOAD_IMPORTERS', true); /** Load WordPress Bootstrap */ require_once( dirname( __FILE__ ) . '/admin.php' ); -if ( !current_user_can('import') ) - wp_die(__('Sorry, you are not allowed to import content in this site.')); +if ( ! current_user_can( 'import' ) ) { + wp_die( __( 'Sorry, you are not allowed to import content.' ) ); +} $title = __('Import'); diff --git a/wp-includes/version.php b/wp-includes/version.php index e337961aa3..3a46075862 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.6-beta2-37997'; +$wp_version = '4.6-beta2-37998'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.