]> scripts.mit.edu Git - autoinstalls/wordpress.git/blobdiff - wp-admin/press-this.php
Wordpress 3.2.1-scripts
[autoinstalls/wordpress.git] / wp-admin / press-this.php
index 4eda788c5c710571b68735f0d4fd979688171e01..70f1808a3af4e91827989fae574dc3ce5702e88f 100644 (file)
@@ -6,30 +6,16 @@
  * @subpackage Press_This
  */
 
+define('IFRAME_REQUEST' , true);
+
 /** WordPress Administration Bootstrap */
-require_once('admin.php');
+require_once('./admin.php');
+
 header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
 
 if ( ! current_user_can('edit_posts') )
        wp_die( __( 'Cheatin’ uh?' ) );
 
-/**
- * Convert characters.
- *
- * @package WordPress
- * @subpackage Press_This
- * @since 2.6.0
- *
- * @param string $text
- * @return string
- */
-function aposfix($text) {
-       $translation_table[chr(34)] = '"';
-       $translation_table[chr(38)] = '&';
-       $translation_table[chr(39)] = ''';
-       return preg_replace("/&(?![A-Za-z]{0,4}\w{2,3};|#[0-9]{2,3};)/","&" , strtr($text, $translation_table));
-}
-
 /**
  * Press It form handler.
  *
@@ -41,11 +27,12 @@ function aposfix($text) {
  */
 function press_it() {
        // define some basic variables
+       $quick = array();
        $quick['post_status'] = 'draft'; // set as draft first
        $quick['post_category'] = isset($_POST['post_category']) ? $_POST['post_category'] : null;
        $quick['tax_input'] = isset($_POST['tax_input']) ? $_POST['tax_input'] : null;
        $quick['post_title'] = ( trim($_POST['title']) != '' ) ? $_POST['title'] : '  ';
-       $quick['post_content'] = isset($_POST['post_content']) ? $_POST['post_content'] : ''; 
+       $quick['post_content'] = isset($_POST['post_content']) ? $_POST['post_content'] : '';
 
        // insert the post with nothing in it, to get an ID
        $post_ID = wp_insert_post($quick, true);
@@ -55,7 +42,7 @@ function press_it() {
        $content = isset($_POST['content']) ? $_POST['content'] : '';
 
        $upload = false;
-       if( !empty($_POST['photo_src']) && current_user_can('upload_files') ) {
+       if ( !empty($_POST['photo_src']) && current_user_can('upload_files') ) {
                foreach( (array) $_POST['photo_src'] as $key => $image) {
                        // see if files exist in content - we don't want to upload non-used selected files.
                        if ( strpos($_POST['content'], htmlspecialchars($image)) !== false ) {
@@ -63,19 +50,36 @@ function press_it() {
                                $upload = media_sideload_image($image, $post_ID, $desc);
 
                                // Replace the POSTED content <img> with correct uploaded ones. Regex contains fix for Magic Quotes
-                               if( !is_wp_error($upload) )
+                               if ( !is_wp_error($upload) )
                                        $content = preg_replace('/<img ([^>]*)src=\\\?(\"|\')'.preg_quote(htmlspecialchars($image), '/').'\\\?(\2)([^>\/]*)\/*>/is', $upload, $content);
                        }
                }
        }
        // set the post_content and status
-       $quick['post_status'] = isset($_POST['publish']) ? 'publish' : 'draft';
+       if ( isset( $_POST['publish'] ) && current_user_can( 'publish_posts' ) )
+               $quick['post_status'] = 'publish';
+       elseif ( isset( $_POST['review'] ) )
+               $quick['post_status'] = 'pending';
+       else
+               $quick['post_status'] = 'draft';
        $quick['post_content'] = $content;
        // error handling for media_sideload
        if ( is_wp_error($upload) ) {
                wp_delete_post($post_ID);
                wp_die($upload);
        } else {
+               // Post formats
+               if ( current_theme_supports( 'post-formats' ) && isset( $_POST['post_format'] ) ) {
+                       $post_formats = get_theme_support( 'post-formats' );
+                       if ( is_array( $post_formats ) ) {
+                               $post_formats = $post_formats[0];
+                               if ( in_array( $_POST['post_format'], $post_formats ) )
+                                       set_post_format( $post_ID, $_POST['post_format'] );
+                               elseif ( '0' == $_POST['post_format'] )
+                                       set_post_format( $post_ID, false );
+                       }
+               }
+
                $quick['ID'] = $post_ID;
                wp_update_post($quick);
        }
@@ -92,11 +96,17 @@ if ( isset($_REQUEST['action']) && 'post' == $_REQUEST['action'] ) {
 }
 
 // Set Variables
-$title = isset( $_GET['t'] ) ? trim( strip_tags( aposfix( stripslashes( $_GET['t'] ) ) ) ) : '';
-$selection = isset( $_GET['s'] ) ? trim( htmlspecialchars( html_entity_decode( aposfix( stripslashes( $_GET['s'] ) ) ) ) ) : '';
+$title = isset( $_GET['t'] ) ? trim( strip_tags( html_entity_decode( stripslashes( $_GET['t'] ) , ENT_QUOTES) ) ) : '';
+
+$selection = '';
+if ( !empty($_GET['s']) ) {
+       $selection = str_replace('&apos;', "'", stripslashes($_GET['s']));
+       $selection = trim( htmlspecialchars( html_entity_decode($selection, ENT_QUOTES) ) );
+}
+
 if ( ! empty($selection) ) {
        $selection = preg_replace('/(\r?\n|\r)/', '</p><p>', $selection);
-       $selection = '<p>'.str_replace('<p></p>', '', $selection).'</p>';
+       $selection = '<p>' . str_replace('<p></p>', '', $selection) . '</p>';
 }
 
 $url = isset($_GET['u']) ? esc_url($_GET['u']) : '';
@@ -121,7 +131,7 @@ if ( !empty($_REQUEST['ajax']) ) {
                        <div class="postbox">
                                <h2><label for="embed-code"><?php _e('Embed Code') ?></label></h2>
                                <div class="inside">
-                                       <textarea name="embed-code" id="embed-code" rows="8" cols="40"><?php echo wp_htmledit_pre( $selection ); ?></textarea>
+                                       <textarea name="embed-code" id="embed-code" rows="8" cols="40"><?php echo esc_textarea( $selection ); ?></textarea>
                                        <p id="options"><a href="#" class="select button"><?php _e('Insert Video'); ?></a> <a href="#" class="close button"><?php _e('Cancel'); ?></a></p>
                                </div>
                        </div>
@@ -195,7 +205,7 @@ if ( !empty($_REQUEST['ajax']) ) {
                 */
                function get_images_from_uri($uri) {
                        $uri = preg_replace('/\/#.+?$/','', $uri);
-                       if( preg_match('/\.(jpg|jpe|jpeg|png|gif)$/', $uri) && !strpos($uri,'blogger.com') )
+                       if ( preg_match('/\.(jpg|jpe|jpeg|png|gif)$/', $uri) && !strpos($uri,'blogger.com') )
                                return "'" . esc_attr( html_entity_decode($uri) ) . "'";
                        $content = wp_remote_fopen($uri);
                        if ( false === $content )
@@ -209,13 +219,13 @@ if ( !empty($_REQUEST['ajax']) ) {
                        $sources = array();
                        foreach ($matches[3] as $src) {
                                // if no http in url
-                               if(strpos($src, 'http') === false)
+                               if (strpos($src, 'http') === false)
                                        // if it doesn't have a relative uri
-                                       if( strpos($src, '../') === false && strpos($src, './') === false && strpos($src, '/') === 0)
+                                       if ( strpos($src, '../') === false && strpos($src, './') === false && strpos($src, '/') === 0)
                                                $src = 'http://'.str_replace('//','/', $host['host'].'/'.$src);
                                        else
                                                $src = 'http://'.str_replace('//','/', $host['host'].'/'.dirname($host['path']).'/'.$src);
-                               $sources[] = esc_attr($src);
+                               $sources[] = esc_url($src);
                        }
                        return "'" . implode("','", $sources) . "'";
                }
@@ -230,22 +240,22 @@ if ( !empty($_REQUEST['ajax']) ) {
                if(photostorage == false) {
                var my_src = eval(
                        jQuery.ajax({
-                               type: "GET",
-                               url: "<?php echo esc_url($_SERVER['PHP_SELF']); ?>",
+                               type: "GET",
+                               url: "<?php echo esc_url($_SERVER['PHP_SELF']); ?>",
                                cache : false,
                                async : false,
-                               data: "ajax=photo_images&u=<?php echo urlencode($url); ?>",
+                               data: "ajax=photo_images&u=<?php echo urlencode($url); ?>",
                                dataType : "script"
                        }).responseText
                );
                if(my_src.length == 0) {
                        var my_src = eval(
                                jQuery.ajax({
-                                       type: "GET",
-                                       url: "<?php echo esc_url($_SERVER['PHP_SELF']); ?>",
+                                       type: "GET",
+                                       url: "<?php echo esc_url($_SERVER['PHP_SELF']); ?>",
                                        cache : false,
                                        async : false,
-                                       data: "ajax=photo_images&u=<?php echo urlencode($url); ?>",
+                                       data: "ajax=photo_images&u=<?php echo urlencode($url); ?>",
                                        dataType : "script"
                                }).responseText
                        );
@@ -302,7 +312,7 @@ if ( !empty($_REQUEST['ajax']) ) {
                        jQuery('#extra-fields').html('');
                        return false;
                }
-                       jQuery('#extra-fields').html('<div class="postbox"><h2>Add Photos <small id="photo_directions">(<?php _e("click images to select") ?>)</small></h2><ul class="actions"><li><a href="#" id="photo-add-url" class="thickbox button"><?php _e("Add from URL") ?> +</a></li></ul><div class="inside"><div class="titlewrap"><div id="img_container"></div></div><p id="options"><a href="#" class="close button"><?php _e('Cancel'); ?></a><a href="#" class="refresh button"><?php _e('Refresh'); ?></a></p></div>');
+                       jQuery('#extra-fields').html('<div class="postbox"><h2><?php _e( 'Add Photos' ); ?> <small id="photo_directions">(<?php _e("click images to select") ?>)</small></h2><ul class="actions"><li><a href="#" id="photo-add-url" class="thickbox button"><?php _e("Add from URL") ?> +</a></li></ul><div class="inside"><div class="titlewrap"><div id="img_container"></div></div><p id="options"><a href="#" class="close button"><?php _e('Cancel'); ?></a><a href="#" class="refresh button"><?php _e('Refresh'); ?></a></p></div>');
                        jQuery('#img_container').html(strtoappend);
                <?php break;
 }
@@ -322,13 +332,12 @@ die;
        wp_enqueue_style( 'press-this-ie');
        wp_enqueue_style( 'colors' );
        wp_enqueue_script( 'post' );
-       wp_enqueue_script( 'editor' );
 ?>
 <script type="text/javascript">
 //<![CDATA[
 addLoadEvent = function(func){if(typeof jQuery!="undefined")jQuery(document).ready(func);else if(typeof wpOnload!='function'){wpOnload=func;}else{var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}};
 var userSettings = {'url':'<?php echo SITECOOKIEPATH; ?>','uid':'<?php if ( ! isset($current_user) ) $current_user = wp_get_current_user(); echo $current_user->ID; ?>','time':'<?php echo time() ?>'};
-var ajaxurl = '<?php echo admin_url('admin-ajax.php'); ?>', pagenow = 'press-this';
+var ajaxurl = '<?php echo admin_url('admin-ajax.php'); ?>', pagenow = 'press-this', isRtl = <?php echo (int) is_rtl(); ?>;
 var photostorage = false;
 //]]>
 </script>
@@ -337,9 +346,6 @@ var photostorage = false;
        do_action('admin_print_styles');
        do_action('admin_print_scripts');
        do_action('admin_head');
-
-       if ( user_can_richedit() )
-               wp_tiny_mce( true, array( 'height' => '370' ) );
 ?>
        <script type="text/javascript">
        function insert_plain_editor(text) {
@@ -360,7 +366,6 @@ var photostorage = false;
        function append_editor(text) {
                if ( '' != text && tinyMCE.activeEditor && ! tinyMCE.activeEditor.isHidden()) {
                        tinyMCE.execCommand('mceSetContent', false, tinyMCE.activeEditor.getContent({format : 'raw'}) + '<p>' + text + '</p>');
-                       tinyMCE.execCommand('mceCleanup');
                } else {
                        insert_plain_editor(text);
                }
@@ -406,12 +411,11 @@ var photostorage = false;
                                                show('photo');
                                        });
                                        jQuery('#photo-add-url').attr('href', '?ajax=photo_thickbox_url&height=200&width=500');
-                                       tb_init('#extra-fields .thickbox');
                                        jQuery('#waiting').hide();
                                        jQuery('#extra-fields').show();
                                }
-                               jQuery('#extra-fields').before('<div id="waiting"><img src="images/wpspin_light.gif" alt="" /> <?php echo esc_js( __( 'Loading...' ) ); ?></div>');
-                               
+                               jQuery('#extra-fields').before('<div id="waiting"><img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" /> <?php echo esc_js( __( 'Loading...' ) ); ?></div>');
+
                                if(photostorage == false) {
                                        jQuery.ajax({
                                                type: "GET",
@@ -437,7 +441,7 @@ var photostorage = false;
                //resize screen
                window.resizeTo(720,540);
                // set button actions
-       jQuery('#photo_button').click(function() { show('photo'); return false; });
+               jQuery('#photo_button').click(function() { show('photo'); return false; });
                jQuery('#video_button').click(function() { show('video'); return false; });
                // auto select
                <?php if ( preg_match("/youtube\.com\/watch/i", $url) ) { ?>
@@ -457,13 +461,15 @@ var photostorage = false;
 </script>
 </head>
 <body class="press-this wp-admin">
-<div id="wphead"></div>
+<?php
+if ( user_can_richedit() ) {
+       wp_tiny_mce( true, array( 'height' => '370' ) );
+}
+?>
 <form action="press-this.php?action=post" method="post">
 <div id="poststuff" class="metabox-holder">
        <div id="side-info-column">
                <div class="sleeve">
-                       <h1 id="viewsite"><a href="<?php echo get_option('home'); ?>/" target="_blank"><?php bloginfo('name'); ?> &rsaquo; <?php _e('Press This') ?></a></span></h1>
-
                        <?php wp_nonce_field('press-this') ?>
                        <input type="hidden" name="post_type" id="post_type" value="text"/>
                        <input type="hidden" name="autosave" id="autosave" />
@@ -473,52 +479,91 @@ var photostorage = false;
                        <!-- This div holds the photo metadata -->
                        <div class="photolist"></div>
 
-                       <div id="submitdiv" class="stuffbox">
-                               <div class="handlediv" title="<?php _e( 'Click to toggle' ); ?>">
-                                       <br/>
-                               </div>
-                               <h3><?php _e('Publish') ?></h3>
+                       <div id="submitdiv" class="postbox">
+                               <div class="handlediv" title="<?php _e( 'Click to toggle' ); ?>"><br /></div>
+                               <h3 class="hndle"><?php _e('Press This') ?></h3>
                                <div class="inside">
+                                       <p id="publishing-actions">
+                                       <?php
+                                               submit_button( __( 'Save Draft' ), 'button', 'draft', false, array( 'id' => 'save' ) );
+                                               if ( current_user_can('publish_posts') ) {
+                                                       submit_button( __( 'Publish' ), 'primary', 'publish', false );
+                                               } else {
+                                                       echo '<br /><br />';
+                                                       submit_button( __( 'Submit for Review' ), 'primary', 'review', false );
+                                               } ?>
+                                               <img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" id="saving" style="display:none;" />
+                                       </p>
+                                       <?php if ( current_theme_supports( 'post-formats' ) && post_type_supports( 'post', 'post-formats' ) ) :
+                                                       $post_formats = get_theme_support( 'post-formats' );
+                                                       if ( is_array( $post_formats[0] ) ) :
+                                                               $default_format = get_option( 'default_post_format', '0' );
+                                               ?>
                                        <p>
-                                               <input class="button" type="submit" name="draft" value="<?php esc_attr_e('Save Draft') ?>" id="save" />
-                                               <?php if ( current_user_can('publish_posts') ) { ?>
-                                                       <input class="button-primary" type="submit" name="publish" value="<?php esc_attr_e('Publish') ?>" id="publish" />
-                                               <?php } else { ?>
-                                                       <br /><br /><input class="button-primary" type="submit" name="review" value="<?php esc_attr_e('Submit for Review') ?>" id="review" />
-                                               <?php } ?>
-                                               <img src="images/wpspin_light.gif" alt="" id="saving" style="display:none;" />
+                                               <label for="post_format"><?php _e( 'Post Format:' ); ?>
+                                               <select name="post_format" id="post_format">
+                                                       <option value="0"><?php _e( 'Standard' ); ?></option>
+                                               <?php foreach ( $post_formats[0] as $format ): ?>
+                                                       <option<?php selected( $default_format, $format ); ?> value="<?php echo esc_attr( $format ); ?>"> <?php echo esc_html( get_post_format_string( $format ) ); ?></option>
+                                               <?php endforeach; ?>
+                                               </select></label>
                                        </p>
+                                       <?php endif; endif; ?>
                                </div>
                        </div>
 
-                       <div id="categorydiv" class="stuffbox">
-                               <div class="handlediv" title="<?php _e( 'Click to toggle' ); ?>">
-                                       <br/>
-                               </div>
-                               <h3><?php _e('Categories') ?></h3>
+                       <?php $tax = get_taxonomy( 'category' ); ?>
+                       <div id="categorydiv" class="postbox">
+                               <div class="handlediv" title="<?php _e( 'Click to toggle' ); ?>"><br /></div>
+                               <h3 class="hndle"><?php _e('Categories') ?></h3>
                                <div class="inside">
+                               <div id="taxonomy-category" class="categorydiv">
 
-                                       <div id="categories-all" class="tabs-panel">
+                                       <ul id="category-tabs" class="category-tabs">
+                                               <li class="tabs"><a href="#category-all" tabindex="3"><?php echo $tax->labels->all_items; ?></a></li>
+                                               <li class="hide-if-no-js"><a href="#category-pop" tabindex="3"><?php _e( 'Most Used' ); ?></a></li>
+                                       </ul>
 
-                                               <ul id="categorychecklist" class="list:category categorychecklist form-no-clear">
-                                                       <?php wp_category_checklist($post_ID, false) ?>
+                                       <div id="category-pop" class="tabs-panel" style="display: none;">
+                                               <ul id="categorychecklist-pop" class="categorychecklist form-no-clear" >
+                                                       <?php $popular_ids = wp_popular_terms_checklist( 'category' ); ?>
                                                </ul>
                                        </div>
 
-                                       <div id="category-adder" class="wp-hidden-children">
-                                               <a id="category-add-toggle" href="#category-add" class="hide-if-no-js" tabindex="3"><?php _e( '+ Add New Category' ); ?></a>
-                                               <p id="category-add" class="wp-hidden-child">
-                                                       <label class="screen-reader-text" for="newcat"><?php _e( 'Add New Category' ); ?></label><input type="text" name="newcat" id="newcat" class="form-required form-input-tip" value="<?php esc_attr_e( 'New category name' ); ?>" tabindex="3" aria-required="true"/>
-                                                       <label class="screen-reader-text" for="newcat_parent"><?php _e('Parent category'); ?>:</label><?php wp_dropdown_categories( array( 'hide_empty' => 0, 'name' => 'newcat_parent', 'orderby' => 'name', 'hierarchical' => 1, 'show_option_none' => __('Parent category'), 'tab_index' => 3 ) ); ?>
-                                                       <input type="button" id="category-add-sumbit" class="add:categorychecklist:category-add button" value="<?php esc_attr_e( 'Add' ); ?>" tabindex="3" />
-                                                       <?php wp_nonce_field( 'add-category', '_ajax_nonce', false ); ?>
-                                                       <span id="category-ajax-response"></span>
-                                               </p>
+                                       <div id="category-all" class="tabs-panel">
+                                               <ul id="categorychecklist" class="list:category categorychecklist form-no-clear">
+                                                       <?php wp_terms_checklist($post_ID, array( 'taxonomy' => 'category', 'popular_cats' => $popular_ids ) ) ?>
+                                               </ul>
                                        </div>
+
+                                       <?php if ( !current_user_can($tax->cap->assign_terms) ) : ?>
+                                       <p><em><?php _e('You cannot modify this Taxonomy.'); ?></em></p>
+                                       <?php endif; ?>
+                                       <?php if ( current_user_can($tax->cap->edit_terms) ) : ?>
+                                               <div id="category-adder" class="wp-hidden-children">
+                                                       <h4>
+                                                               <a id="category-add-toggle" href="#category-add" class="hide-if-no-js" tabindex="3">
+                                                                       <?php printf( __( '+ %s' ), $tax->labels->add_new_item ); ?>
+                                                               </a>
+                                                       </h4>
+                                                       <p id="category-add" class="category-add wp-hidden-child">
+                                                               <label class="screen-reader-text" for="newcategory"><?php echo $tax->labels->add_new_item; ?></label>
+                                                               <input type="text" name="newcategory" id="newcategory" class="form-required form-input-tip" value="<?php echo esc_attr( $tax->labels->new_item_name ); ?>" tabindex="3" aria-required="true"/>
+                                                               <label class="screen-reader-text" for="newcategory_parent">
+                                                                       <?php echo $tax->labels->parent_item_colon; ?>
+                                                               </label>
+                                                               <?php wp_dropdown_categories( array( 'taxonomy' => 'category', 'hide_empty' => 0, 'name' => 'newcategory_parent', 'orderby' => 'name', 'hierarchical' => 1, 'show_option_none' => '&mdash; ' . $tax->labels->parent_item . ' &mdash;', 'tab_index' => 3 ) ); ?>
+                                                               <input type="button" id="category-add-submit" class="add:categorychecklist:category-add button category-add-sumbit" value="<?php echo esc_attr( $tax->labels->add_new_item ); ?>" tabindex="3" />
+                                                               <?php wp_nonce_field( 'add-category', '_ajax_nonce-add-category', false ); ?>
+                                                               <span id="category-ajax-response"></span>
+                                                       </p>
+                                               </div>
+                                       <?php endif; ?>
+                               </div>
                                </div>
                        </div>
 
-                       <div id="tagsdiv-post_tag" class="stuffbox" >
+                       <div id="tagsdiv-post_tag" class="postbox">
                                <div class="handlediv" title="<?php _e( 'Click to toggle' ); ?>">
                                        <br/>
                                </div>
@@ -535,14 +580,24 @@ var photostorage = false;
                                                </p>
                                                <div class="tagchecklist"></div>
                                        </div>
-                                       <p class="tagcloud-link"><a href="#titlediv" class="tagcloud-link" id="link-post_tag"><?php _e('Choose from the most used tags in Post Tags'); ?></a></p>
+                                       <p class="tagcloud-link"><a href="#titlediv" class="tagcloud-link" id="link-post_tag"><?php _e('Choose from the most used tags'); ?></a></p>
                                </div>
                        </div>
                </div>
        </div>
        <div class="posting">
+
+               <div id="wphead">
+                       <img id="header-logo" src="<?php echo esc_url( includes_url( 'images/blank.gif' ) ); ?>" alt="" width="16" height="16" />
+                       <h1 id="site-heading">
+                               <a href="<?php echo get_option('home'); ?>/" target="_blank">
+                                       <span id="site-title"><?php bloginfo('name'); ?></span>
+                               </a>
+                       </h1>
+               </div>
+
                <?php if ( isset($posted) && intval($posted) ) { $post_ID = intval($posted); ?>
-               <div id="message" class="updated fade"><p><strong><?php _e('Your post has been saved.'); ?></strong> <a onclick="window.opener.location.replace(this.href); window.close();" href="<?php echo get_permalink( $post_ID); ?>"><?php _e('View post'); ?></a> | <a href="<?php echo get_edit_post_link( $post_ID ); ?>" onclick="window.opener.location.replace(this.href); window.close();"><?php _e('Edit post'); ?></a> | <a href="#" onclick="window.close();"><?php _e('Close Window'); ?></a></p></div>
+               <div id="message" class="updated"><p><strong><?php _e('Your post has been saved.'); ?></strong> <a onclick="window.opener.location.replace(this.href); window.close();" href="<?php echo get_permalink( $post_ID); ?>"><?php _e('View post'); ?></a> | <a href="<?php echo get_edit_post_link( $post_ID ); ?>" onclick="window.opener.location.replace(this.href); window.close();"><?php _e('Edit Post'); ?></a> | <a href="#" onclick="window.close();"><?php _e('Close Window'); ?></a></p></div>
                <?php } ?>
 
                <div id="titlediv">
@@ -554,26 +609,26 @@ var photostorage = false;
                <div id="extra-fields" style="display: none"></div>
 
                <div class="postdivrich">
-                       <ul id="actions" class="actions">
-
-                               <li id="photo_button">
-                                       Add: <?php if ( current_user_can('upload_files') ) { ?><a title="<?php _e('Insert an Image'); ?>" href="#">
-<img alt="<?php _e('Insert an Image'); ?>" src="images/media-button-image.gif"/></a>
-                                       <?php } ?>
-                               </li>
-                               <li id="video_button">
-                                       <a title="<?php _e('Embed a Video'); ?>" href="#"><img alt="<?php _e('Embed a Video'); ?>" src="images/media-button-video.gif"/></a>
-                               </li>
-                               <?php if( user_can_richedit() ) { ?>
-                               <li id="switcher">
-                                       <?php wp_print_scripts( 'quicktags' ); ?>
-                                       <?php add_filter('the_editor_content', 'wp_richedit_pre'); ?>
+                       <div id="editor-toolbar">
+                               <?php if ( user_can_richedit() ) :
+                                       wp_print_scripts( 'quicktags' );
+                                       add_filter('the_editor_content', 'wp_richedit_pre'); ?>
                                        <a id="edButtonHTML" onclick="switchEditors.go('content', 'html');"><?php _e('HTML'); ?></a>
                                        <a id="edButtonPreview" class="active" onclick="switchEditors.go('content', 'tinymce');"><?php _e('Visual'); ?></a>
                                        <div class="zerosize"><input accesskey="e" type="button" onclick="switchEditors.go('content')" /></div>
-                               </li>
-                               <?php } ?>
-                       </ul>
+                               <?php endif; ?>
+
+                               <div id="media-buttons">
+                                       <?php
+                                       _e( 'Add:' );
+
+                                       if ( current_user_can('upload_files') ) : ?>
+                                               <a id="photo_button" title="<?php _e('Insert an Image'); ?>" href="#">
+<img alt="<?php _e('Insert an Image'); ?>" src="<?php echo esc_url( admin_url( 'images/media-button-image.gif?ver=20100531' ) ); ?>"/></a><?php
+                                       endif;
+                                       ?><a id="video_button" title="<?php _e('Embed a Video'); ?>" href="#"><img alt="<?php _e('Embed a Video'); ?>" src="<?php echo esc_url( admin_url( 'images/media-button-video.gif?ver=20100531' ) ); ?>"/></a>
+                               </div>
+                       </div>
                        <div id="quicktags"></div>
                        <div class="editor-container">
                                <textarea name="content" id="content" style="width:100%;" class="theEditor" rows="15"><?php