From 65c1468ff51eaff16aebfd7a5ab30bfc1fb7c58b Mon Sep 17 00:00:00 2001
From: Konstantin Obenland <obenland@automattic.com>
Date: Fri, 3 Nov 2017 18:51:49 +0000
Subject: [PATCH] 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
---
 wp-admin/includes/misc.php | 4 ++--
 wp-includes/version.php    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/wp-admin/includes/misc.php b/wp-admin/includes/misc.php
index 7b2301a2a9..7f5952c895 100644
--- a/wp-admin/includes/misc.php
+++ b/wp-admin/includes/misc.php
@@ -333,7 +333,7 @@ function wp_print_theme_file_tree( $tree, $level = 2, $size = 1, $index = 1 ) {
 				'file' => rawurlencode( $tree ),
 				'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' : '' ); ?>">
@@ -421,7 +421,7 @@ function wp_print_plugin_file_tree( $tree, $label = '', $level = 2, $size = 1, $
 				'file' => rawurlencode( $tree ),
 				'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' : '' ); ?>">
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 3ccfcf06d5..2e06e30062 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @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.