From c7058c739d2e19662cf1001b0f3cb6becae27932 Mon Sep 17 00:00:00 2001
From: Andrew Ozz <admin@laptoptips.ca>
Date: Sat, 22 Apr 2017 01:12:44 +0000
Subject: [PATCH] Editor: fix undefined var notice in editor_js() in
 class-wp-editor.php.

Props littler.chicken.
Fixes #40501, see #35760.
Built from https://develop.svn.wordpress.org/trunk@40515


git-svn-id: http://core.svn.wordpress.org/trunk@40391 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/class-wp-editor.php | 3 +++
 wp-includes/version.php         | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/wp-includes/class-wp-editor.php b/wp-includes/class-wp-editor.php
index 7293ea1159..21353c6824 100644
--- a/wp-includes/class-wp-editor.php
+++ b/wp-includes/class-wp-editor.php
@@ -1357,6 +1357,8 @@ final class _WP_Editors {
 	 * @static
 	 */
 	public static function editor_js() {
+		global $tinymce_version;
+
 		$tmce_on = ! empty( self::$mce_settings );
 		$mceInit = $qtInit = '';
 
@@ -1388,6 +1390,7 @@ final class _WP_Editors {
 
 		$suffix = SCRIPT_DEBUG ? '' : '.min';
 		$baseurl = self::get_baseurl();
+		$version = 'ver=' . $tinymce_version;
 
 		/**
 		 * Fires immediately before the TinyMCE settings are printed.
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 3f07a323d1..72b582c6da 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.8-alpha-40513';
+$wp_version = '4.8-alpha-40515';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.