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

File Editors: Account for network admin use 

Fixes a bug where files couldn't be accessed in multisite installs.

Props flixos90, westonruter.
Fixes #42420.


Built from https://develop.svn.wordpress.org/trunk@42115


git-svn-id: http://core.svn.wordpress.org/trunk@41944 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Konstantin Obenland 2017-11-03 18:51:49 +00:00
parent 76e01c3562
commit 65c1468ff5
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-admin/includes/misc.php
View File

@ -333,7 +333,7 @@ function wp_print_theme_file_tree( $tree, $level = 2, $size = 1, $index = 1 ) {
'file' => rawurlencode( $tree ), 'file' => rawurlencode( $tree ),
'theme' => rawurlencode( $stylesheet ), 'theme' => rawurlencode( $stylesheet ),
), ),
admin_url( 'theme-editor.php' ) self_admin_url( 'theme-editor.php' )
); );
?> ?>
<li role="none" class="<?php echo esc_attr( $relative_file === $filename ? 'current-file' : '' ); ?>"> <li role="none" class="<?php echo esc_attr( $relative_file === $filename ? 'current-file' : '' ); ?>">
@ -421,7 +421,7 @@ function wp_print_plugin_file_tree( $tree, $label = '', $level = 2, $size = 1, $
'file' => rawurlencode( $tree ), 'file' => rawurlencode( $tree ),
'plugin' => rawurlencode( $plugin ), 'plugin' => rawurlencode( $plugin ),
), ),
admin_url( 'plugin-editor.php' ) self_admin_url( 'plugin-editor.php' )
); );
?> ?>
<li role="none" class="<?php echo esc_attr( $file === $tree ? 'current-file' : '' ); ?>"> <li role="none" class="<?php echo esc_attr( $file === $tree ? 'current-file' : '' ); ?>">

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.9-RC1-42114'; $wp_version = '4.9-RC1-42115';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.