From 2ca39ce60d6da64393d39d644d303428620821a0 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Wed, 5 Jul 2017 18:55:44 +0000 Subject: [PATCH] Docs: Add a `@global` entry for `$tinymce_version` in `_WP_Editors::default_settings()`. Props tejas5989. Fixes #41244. Built from https://develop.svn.wordpress.org/trunk@41007 git-svn-id: http://core.svn.wordpress.org/trunk@40857 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/class-wp-editor.php | 2 ++ wp-includes/version.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/wp-includes/class-wp-editor.php b/wp-includes/class-wp-editor.php index 86966d6f6b..4721c94cba 100644 --- a/wp-includes/class-wp-editor.php +++ b/wp-includes/class-wp-editor.php @@ -928,6 +928,8 @@ final class _WP_Editors { * Returns the default TinyMCE settings. * Doesn't include plugins, buttons, editor selector. * + * @global string $tinymce_version + * * @return array */ private static function default_settings() { diff --git a/wp-includes/version.php b/wp-includes/version.php index 5c919d8837..68b351fc38 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.9-alpha-41006'; +$wp_version = '4.9-alpha-41007'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.