Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Dominik Schilling 2016-07-07 10:53:28 +00:00
parent 6953feb795
commit 65eb29ad46
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wp-admin/admin.php
View File

@ -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 ) );

5
wp-admin/import.php
View File

@ -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');

2
wp-includes/version.php
View File

@ -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.