Changeset 4417

Timestamp:

10/24/2006 03:57:19 AM (18 years ago)

Author:

markjaquith

Message:

Don't assume that TinyMCE exists, and degrade gracefully if it doesn't. fixes #3272

Location:

trunk

Files:

• wp-admin/admin-functions.php (modified) (2 diffs)
• wp-admin/profile-update.php (modified) (1 diff)
• wp-admin/profile.php (modified) (1 diff)
• wp-includes/general-template.php (modified) (1 diff)

trunk/wp-admin/admin-functions.php

@@ -288 +288 @@
 // Get an existing post and format it for editing.
 function get_post_to_edit($id) {
-    global $richedit;
-    $richedit = ( 'true' == get_user_option('rich_editing') ) ? true : false;
 
     $post = get_post($id);
 
-    $post->post_content = format_to_edit($post->post_content, $richedit);
+    $post->post_content = format_to_edit($post->post_content, user_can_richedit());
     $post->post_content = apply_filters('content_edit_pre', $post->post_content);
 
@@ -351 +349 @@
 
 function get_comment_to_edit($id) {
-    global $richedit;
-    $richedit = ( 'true' == get_user_option('rich_editing') ) ? true : false;
-
     $comment = get_comment($id);
 
-    $comment->comment_content = format_to_edit($comment->comment_content, $richedit);
+    $comment->comment_content = format_to_edit($comment->comment_content, user_can_richedit());
     $comment->comment_content = apply_filters('comment_edit_pre', $comment->comment_content);
 

trunk/wp-admin/profile-update.php

@@ -18 +18 @@
 }
 
-if ( !isset( $_POST['rich_editing'] ) )
-    $_POST['rich_editing'] = 'false';
-update_user_option( $current_user->id, 'rich_editing', $_POST['rich_editing'], true );
+if ( rich_edit_exists() ) {
+    if ( !isset( $_POST['rich_editing'] ) )
+        $_POST['rich_editing'] = 'false';
+    update_user_option( $current_user->id, 'rich_editing', $_POST['rich_editing'], true );
+}
 
 do_action('personal_options_update');

trunk/wp-admin/profile.php

@@ -31 +31 @@
 <h3><?php _e('Personal Options'); ?></h3>
 
+<?php if ( rich_edit_exists() ) : // don't bother showing the option if the editor has been removed ?>
 <p><label for="rich_editing"><input name="rich_editing" type="checkbox" id="rich_editing" value="true" <?php checked('true', get_user_option('rich_editing')); ?> />
 <?php _e('Use the visual editor when writing') ?></label></p>
+<?php endif; ?>
 
 <?php do_action('profile_personal_options'); ?>

trunk/wp-includes/general-template.php

@@ -751 +751 @@
 }
 
+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;
+}
+
 function user_can_richedit() {
-    $can = true;
-
-    if ( 'true' != get_user_option('rich_editing') || preg_match('!opera[ /][2-8]|konqueror|safari!i', $_SERVER['HTTP_USER_AGENT']) )
-        $can = false;
-
-    return apply_filters('user_can_richedit', $can);
+    global $wp_rich_edit;
+    
+    if ( !isset($wp_rich_edit) )
+        $wp_rich_edit = ( 'true' == get_user_option('rich_editing') && !preg_match('!opera[ /][2-8]|konqueror|safari!i', $_SERVER['HTTP_USER_AGENT']) && rich_edit_exists() ) ? true : false;
+
+    return apply_filters('user_can_richedit', $wp_rich_edit);
 }