Ticket #26786: 26786.patch

src/wp-admin/user-edit.php

@@ -241 +241 @@
 <h3><?php _e('Personal Options'); ?></h3>
 
 <table class="form-table">
-<?php if ( rich_edit_exists() && !( IS_PROFILE_PAGE && !$user_can_edit ) ) : // don't bother showing the option if the editor has been removed ?>
+<?php if ( ! ( IS_PROFILE_PAGE && ! $user_can_edit ) ) : ?>
         <tr>
                 <th scope="row"><?php _e('Visual Editor')?></th>
                 <td><label for="rich_editing"><input name="rich_editing" type="checkbox" id="rich_editing" value="false" <?php if ( ! empty( $profileuser->rich_editing ) ) checked( 'false', $profileuser->rich_editing ); ?> /> <?php _e( 'Disable the visual editor when writing' ); ?></label></td>

src/wp-includes/deprecated.php

@@ -3392 +3392 @@
         _deprecated_function( __FUNCTION__, '3.7' );
         return trim( $t, "\"'\n\r " );
 }
+
+/**
+ * Determine if TinyMCE is available.
+ *
+ * Checks to see if the user has deleted the tinymce files to slim down their WordPress install.
+ *
+ * @since 2.1.0
+ * @deprecated 3.9.0
+ *
+ * @return bool Whether TinyMCE exists.
+ */
+function rich_edit_exists() {
+        global $wp_rich_edit_exists;
+        _deprecated_function( __FUNCTION__, '3.9' );
+
+        if ( ! isset( $wp_rich_edit_exists ) )
+                $wp_rich_edit_exists = file_exists( ABSPATH . WPINC . '/js/tinymce/tinymce.js' );
+
+        return $wp_rich_edit_exists;
+}
+

src/wp-includes/general-template.php

@@ -1797 +1797 @@
 }
 
 /**
- * Determine if TinyMCE is available.
- *
- * Checks to see if the user has deleted the tinymce files to slim down there WordPress install.
- *
- * @since 2.1.0
- *
- * @return bool Whether TinyMCE exists.
- */
-function rich_edit_exists() {
-        global $wp_rich_edit_exists;
-        if ( !isset($wp_rich_edit_exists) )
-                $wp_rich_edit_exists = file_exists(ABSPATH . WPINC . '/js/tinymce/tiny_mce.js');
-        return $wp_rich_edit_exists;
-}
-
-/**
  * Whether the user should have a WYSIWIG editor.
  *
  * Checks that the user requires a WYSIWIG editor and that the editor is