Changeset 6567 for trunk/wp-includes/general-template.php

Timestamp:

01/06/2008 07:01:32 PM (19 years ago)

Author:

ryan

Message:

Remember last editor chosen. Props mdawaffe. fixes #3978

File:

• trunk/wp-includes/general-template.php (modified) (5 diffs)

trunk/wp-includes/general-template.php

@@ -908 +908 @@
 }
 
+function wp_default_editor() {
+        $r = user_can_richedit() ? 'tinymce' : 'html'; // defaults
+        if ( $user = wp_get_current_user() ) { // look for cookie
+                if ( isset($_COOKIE['wordpress_editor_' . $user->ID]) && in_array($_COOKIE['wordpress_editor_' . $user->ID], array('tinymce', 'html', 'test') ) )
+                        $r = $_COOKIE['wordpress_editor_' . $user->ID];
+        }
+        return apply_filters( 'wp_default_editor', $r ); // filter
+}
+
 function the_editor($content, $id = 'content', $prev_id = 'title') {
         $rows = get_option('default_post_edit_rows');
@@ -916 +925 @@
 
         if ( user_can_richedit() ) :
-                add_filter('the_editor_content', 'wp_richedit_pre');
+                $wp_default_editor = wp_default_editor();
+                $active = " class='active'";
+                $inactive = " onclick='switchEditors(\"$id\");'";
+
+                if ( 'tinymce' == $wp_default_editor )
+                        add_filter('the_editor_content', 'wp_richedit_pre');
 
                 //      The following line moves the border so that the active button "attaches" to the toolbar. Only IE needs it.
@@ -926 +940 @@
         <div id='editor-toolbar' style='display:none;'>
                 <div class='zerosize'><input accesskey='e' type='button' onclick='switchEditors("<?php echo $id; ?>")' /></div>
-                <a id='edButtonHTML' class='' onclick='switchEditors("<?php echo $id; ?>")'><?php _e('HTML'); ?></a>
-        <a id='edButtonPreview' class='active'><?php _e('Visual'); ?></a>
-        <div id="media-buttons">
-        <?php _e('Add media:'); ?>
-        <?php do_action( 'media_buttons'); ?>
-        </div>
+                <a id='edButtonHTML'<?php echo 'html' == $wp_default_editor ? $active : $inactive; ?>><?php _e('HTML'); ?></a>
+                <a id='edButtonPreview'<?php echo 'tinymce' == $wp_default_editor ? $active : $inactive; ?>><?php _e('Visual'); ?></a>
+
+                <div id="media-buttons">
+                <?php _e('Add media:'); ?>
+                <?php do_action( 'media_buttons'); ?>
+                </div>
         </div>
+
         <script type="text/javascript">
         // <![CDATA[
@@ -940 +956 @@
         </script>
 
-        <?php endif; ?>
+        <?php endif; // user_can_richedit() ?>
+
         <div id="quicktags">
         <?php wp_print_scripts( 'quicktags' ); ?>
         <script type="text/javascript">edToolbar()</script>
         </div>
+
+        <?php if ( 'html' != $wp_default_editor ) : ?>
         <script type="text/javascript">
         // <![CDATA[
@@ -951 +970 @@
         // ]]>
         </script>
-        <?php
-
-        $the_editor = apply_filters('the_editor', "<div><textarea class='mceEditor' $rows cols='40' name='$id' tabindex='2' id='$id'>%s</textarea></div>\n");
+        <?php endif; // 'html' != $wp_default_editor
+
+        $the_editor = apply_filters('the_editor', "<div><textarea class='' $rows cols='40' name='$id' tabindex='2' id='$id'>%s</textarea></div>\n");
         $the_editor_content = apply_filters('the_editor_content', $content);