Changeset 8242 for branches

Timestamp:

07/02/08 23:07:56 (5 months ago)

Author:

mdawaffe

Message:

crazyhorse: merge with log:trunk@8151:8240

Files:

• branches/crazyhorse/wp-admin/admin-ajax.php (modified) (1 diff)
• branches/crazyhorse/wp-admin/admin-header.php (modified) (3 diffs)
• branches/crazyhorse/wp-admin/async-upload.php (modified) (1 diff)
• branches/crazyhorse/wp-admin/css/press-this.css (modified) (2 diffs)
• branches/crazyhorse/wp-admin/edit-form-advanced.php (modified) (1 diff)
• branches/crazyhorse/wp-admin/gears-manifest.php (modified) (3 diffs)
• branches/crazyhorse/wp-admin/includes/file.php (modified) (1 diff)
• branches/crazyhorse/wp-admin/includes/media.php (modified) (5 diffs)
• branches/crazyhorse/wp-admin/includes/misc.php (modified) (1 diff)
• branches/crazyhorse/wp-admin/includes/schema.php (modified) (2 diffs)
• branches/crazyhorse/wp-admin/includes/template.php (modified) (2 diffs)
• branches/crazyhorse/wp-admin/includes/upgrade.php (modified) (5 diffs)
• branches/crazyhorse/wp-admin/includes/user.php (modified) (2 diffs)
• branches/crazyhorse/wp-admin/install.php (modified) (3 diffs)
• branches/crazyhorse/wp-admin/js/editor.js (modified) (3 diffs)
• branches/crazyhorse/wp-admin/js/media-upload.js (modified) (3 diffs)
• branches/crazyhorse/wp-admin/js/post.js (modified) (2 diffs)
• branches/crazyhorse/wp-admin/js/theme-preview.js (modified) (1 diff)
• branches/crazyhorse/wp-admin/options-writing.php (modified) (1 diff)
• branches/crazyhorse/wp-admin/plugins.php (modified) (11 diffs)
• branches/crazyhorse/wp-admin/press-this.php (modified) (24 diffs)
• branches/crazyhorse/wp-admin/revision.php (modified) (1 diff)
• branches/crazyhorse/wp-admin/setup-config.php (modified) (1 diff)
• branches/crazyhorse/wp-admin/theme-editor.php (modified) (1 diff)
• branches/crazyhorse/wp-admin/user-edit.php (modified) (2 diffs)
• branches/crazyhorse/wp-app.php (modified) (1 diff)
• branches/crazyhorse/wp-content/themes/classic/style.css (modified) (1 diff)
• branches/crazyhorse/wp-content/themes/default/style.css (modified) (1 diff)
• branches/crazyhorse/wp-includes/bookmark-template.php (modified) (2 diffs)
• branches/crazyhorse/wp-includes/class-smtp.php (modified) (1 diff)
• branches/crazyhorse/wp-includes/comment-template.php (modified) (39 diffs)
• branches/crazyhorse/wp-includes/default-filters.php (modified) (1 diff)
• branches/crazyhorse/wp-includes/functions.php (modified) (32 diffs)
• branches/crazyhorse/wp-includes/js/autosave.js (modified) (4 diffs)
• branches/crazyhorse/wp-includes/js/jquery/suggest.js (modified) (4 diffs)
• branches/crazyhorse/wp-includes/js/jquery/ui.core.js (modified) (1 diff)
• branches/crazyhorse/wp-includes/js/jquery/ui.sortable.js (modified) (1 diff)
• branches/crazyhorse/wp-includes/js/jquery/ui.tabs.js (modified) (1 diff)
• branches/crazyhorse/wp-includes/js/tinymce/langs/wp-langs.php (modified) (3 diffs)
• branches/crazyhorse/wp-includes/js/tinymce/plugins/fullscreen/editor_plugin.js (modified) (1 diff)
• branches/crazyhorse/wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm (modified) (1 diff)
• branches/crazyhorse/wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js (modified) (1 diff)
• branches/crazyhorse/wp-includes/js/tinymce/plugins/inlinepopups/template.htm (modified) (1 diff)
• branches/crazyhorse/wp-includes/js/tinymce/plugins/media/editor_plugin.js (modified) (1 diff)
• branches/crazyhorse/wp-includes/js/tinymce/plugins/media/media.htm (modified) (1 diff)
• branches/crazyhorse/wp-includes/js/tinymce/plugins/paste/blank.htm (modified) (1 diff)
• branches/crazyhorse/wp-includes/js/tinymce/plugins/paste/pastetext.htm (modified) (1 diff)
• branches/crazyhorse/wp-includes/js/tinymce/plugins/paste/pasteword.htm (modified) (1 diff)
• branches/crazyhorse/wp-includes/js/tinymce/plugins/safari/editor_plugin.js (modified) (1 diff)
• branches/crazyhorse/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js (modified) (3 diffs)
• branches/crazyhorse/wp-includes/js/tinymce/plugins/wpeditimage/css/editimage-rtl.css (modified) (4 diffs)
• branches/crazyhorse/wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css (modified) (5 diffs)
• branches/crazyhorse/wp-includes/js/tinymce/plugins/wpeditimage/editimage.html (modified) (4 diffs)
• branches/crazyhorse/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js (modified) (5 diffs)
• branches/crazyhorse/wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js (modified) (15 diffs)
• branches/crazyhorse/wp-includes/js/tinymce/themes/advanced/about.htm (modified) (1 diff)
• branches/crazyhorse/wp-includes/js/tinymce/themes/advanced/anchor.htm (modified) (1 diff)
• branches/crazyhorse/wp-includes/js/tinymce/themes/advanced/charmap.htm (modified) (1 diff)
• branches/crazyhorse/wp-includes/js/tinymce/themes/advanced/color_picker.htm (modified) (1 diff)
• branches/crazyhorse/wp-includes/js/tinymce/themes/advanced/image.htm (modified) (1 diff)
• branches/crazyhorse/wp-includes/js/tinymce/themes/advanced/link.htm (modified) (1 diff)
• branches/crazyhorse/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css (modified) (2 diffs)
• branches/crazyhorse/wp-includes/js/tinymce/themes/advanced/source_editor.htm (modified) (1 diff)
• branches/crazyhorse/wp-includes/js/tinymce/tiny_mce.js (modified) (1 diff)
• branches/crazyhorse/wp-includes/js/tinymce/tiny_mce_config.php (modified) (4 diffs)
• branches/crazyhorse/wp-includes/js/tinymce/wordpress.css (modified) (3 diffs)
• branches/crazyhorse/wp-includes/js/tinymce/wp-mce-help.php (modified) (1 diff)
• branches/crazyhorse/wp-includes/link-template.php (modified) (1 diff)
• branches/crazyhorse/wp-includes/media.php (modified) (1 diff)
• branches/crazyhorse/wp-includes/pluggable.php (modified) (44 diffs)
• branches/crazyhorse/wp-includes/post.php (modified) (36 diffs)
• branches/crazyhorse/wp-includes/query.php (modified) (2 diffs)
• branches/crazyhorse/wp-includes/rewrite.php (modified) (3 diffs)
• branches/crazyhorse/wp-includes/script-loader.php (modified) (6 diffs)
• branches/crazyhorse/wp-includes/shortcodes.php (modified) (10 diffs)
• branches/crazyhorse/wp-includes/taxonomy.php (modified) (45 diffs)
• branches/crazyhorse/wp-includes/version.php (modified) (1 diff)
• branches/crazyhorse/wp-includes/widgets.php (modified) (1 diff)
• branches/crazyhorse/wp-includes/wp-db.php (modified) (29 diffs)
• branches/crazyhorse/wp-load.php (modified) (1 diff)
• branches/crazyhorse/wp-login.php (modified) (5 diffs)
• branches/crazyhorse/wp-settings.php (modified) (4 diffs)
• branches/crazyhorse/xmlrpc.php (modified) (11 diffs)

branches/crazyhorse/wp-admin/admin-ajax.php

@@ -14 +14 @@
-    $s = $_GET['q']; // is this slashed already?
-
-
-
-
+
+
+
+
+
+
+
+
-    echo join( $results, "\n" );
-    die;

branches/crazyhorse/wp-admin/admin-header.php

@@ -80 +80 @@
-    <div id="gears-msg1">
-    <h3 class="info-box-title"><?php _e('Speed up WordPress'); ?></h3>
-has support for Gears that
+now has support for Gears, which
-    <a href="http://gears.google.com/" target="_blank" style="font-weight:normal;"><?php _e('More information...'); ?></a></p>
-
-
-
-
+
+
+
-    </div>
-
@@ -94 +93 @@
-    <p><strong><?php _e('However if this is a public or shared computer, Gears should not be enabled.'); ?></strong></p>
-    <div class="submit"><button class="button" onclick="wpGears.getPermission();"><?php _e('Enable Gears'); ?></button>
-Cancel
+<?php _e('Cancel'); ?>
-    </div>
-
@@ -111 +110 @@
-    <?php printf(__('Howdy, <a href="%1$s">%2$s</a>!'), 'profile.php', $user_identity) ?> |
-    <a href="<?php echo site_url('wp-login.php?action=logout', 'login') ?>" title="<?php _e('Log Out') ?>"><?php _e('Log Out'); ?></a>
-Speed up!
+Turbo
-</p></div>
-

branches/crazyhorse/wp-admin/async-upload.php

@@ -11 +11 @@
-
-// Flash often fails to send cookies with the POST or upload, so we need to pass it in GET or POST instead
-
+
+
+
-    $_COOKIE[AUTH_COOKIE] = $_REQUEST['auth_cookie'];
-unset($current_user);

branches/crazyhorse/wp-admin/css/press-this.css

@@ -295 +295 @@
-}
-
+#img_container a {
+    display: block;
+    width: 79px;
+    height: 79px;
+    float: left;
+}
-#img_container img {
-    width: 75px;
-    height: 75px;
+    border: 0px;
-    padding: 2px;
-    background-color: #f4f4f4;
-    margin-right: 7px;
-    margin-bottom: 7px;
-    cursor: pointer;
-}
+#img_container a, #img_container a:link, #img_container a:visited {
+    border: 2px solid #ccc;
+    margin: 0 4px 4px 0;
+} 
+#img_container a:hover, #img_container a:active {
+    border: 2px solid #000;
+}
-.submit {
-
-
-
-
-
-
-
-
-
-
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
-}
-.submitbox {
@@ -467 +479 @@
-
-#post_status {
-
-
-
+   
+   
+   
-}
-

branches/crazyhorse/wp-admin/edit-form-advanced.php

@@ -23 +23 @@
-    $form_extra = "<input type='hidden' id='post_ID' name='post_ID' value='$post_ID' />";
-    $autosave = wp_get_post_autosave( $post_id );
-
-
+
+
+
+
+
+
+
+
+
+
+
-}
-

branches/crazyhorse/wp-admin/gears-manifest.php

@@ -16 +16 @@
-function site_url() {}
-function admin_url() {}
+function wp_guess_url() {}
-
-require(ABSPATH . '/wp-includes/script-loader.php');
@@ -64 +65 @@
-{
-"betaManifestVersion" : 1,
-618
+701
-"entries" : [
-<?php echo $defaults; ?>
@@ -112 +113 @@
-{ "url" : "../wp-includes/js/swfupload/swfupload_f9.swf" },
-
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-{ "url" : "../wp-includes/js/tinymce/themes/advanced/img/icons.gif" },

branches/crazyhorse/wp-admin/includes/file.php

@@ -286 +286 @@
-
-    $filename = wp_unique_filename( $uploads['path'], $file['name'], $unique_filename_callback );
-
+
+
+
+
+
-    // Move the file to the uploads dir
-    $new_file = $uploads['path'] . "/$filename";

branches/crazyhorse/wp-admin/includes/media.php

@@ -63 +63 @@
-}
-
+function image_add_caption( $html, $id, $alt, $title, $align, $url, $size ) {
+
+    if ( empty($alt) ) return $html;
+    $id = ( 0 < (int) $id ) ? 'attachment_' . $id : '';
+
+    preg_match( '/width="([0-9]+)/', $html, $matches );
+    if ( ! isset($matches[1]) ) return $html;
+    $width = $matches[1];
+
+    $html = preg_replace( '/align[^\s\'"]+\s?/', '', $html );
+    if ( empty($align) ) $align = 'none';
+
+    $shcode = '[wp_caption id="' . $id . '" align="align' . $align
+    . '" width="' . $width . '" caption="' . $alt . '"]' . $html . '[/wp_caption]';
+
+    return apply_filters( 'image_add_caption_shortcode', $shcode, $html );
+}
+add_filter( 'image_send_to_editor', 'image_add_caption', 20, 7 );
+
-function media_send_to_editor($html) {
-    ?>
-<script type="text/javascript">
-
-top.send_to_editor('<?php echo addslashes($html); ?>')
-top.tb_remove(
-
+
+var win = window.dialogArguments || opener || parent || top
+win.send_to_editor('<?php echo addslashes($html); ?>'
+
-</script>
-    <?php
@@ -116 +135 @@
-}
-
-
-function media_sideload_image($file, $post_id, $desc = null) {
-
-    if (!empty($file) ) {
-        // Upload File button was clicked
-        
-        $file_array['name'] = basename($file);
-        $file_array['tmp_name'] = download_url($file);
-        $desc = @$desc;
-        
-        $sideload = media_handle_sideload($file_array, $post_id, $desc);
-
-        $id = $sideload['id'];
-        $src = $sideload['src'];
-        
-        unset($file_array['tmp_name']);
-        unset($file_array);
-        
-        if ( is_wp_error($id) ) {
-            $errors['upload_error'] = $id;
-            $id = false;
-        }
-    }
-    
-    if ( !empty($src) && !strpos($src, '://') )
-        
-        $src = "http://$src";
-        $alt = @$desc;
-        
-        if ( !empty($src) )
-            $html = "<img src='$src' alt='$alt' />";
-            return $html;
-    
-}
-
-function media_handle_sideload($file_array, $post_id, $desc = null, $post_data = array()) {
-    $overrides = array('test_form'=>false);
@@ -187 +171 @@
-    if ( !is_wp_error($id) ) {
-        wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) );
-
-
-
-
+
+
+
-}
-
@@ -347 +330 @@
-
-    return wp_iframe( 'media_upload_type_form', 'image', $errors, $id );
+}
+
+function media_sideload_image($file, $post_id, $desc = null) {
+    if (!empty($file) ) {
+        $file_array['name'] = basename($file);
+        $file_array['tmp_name'] = download_url($file);
+        $desc = @$desc;
+        
+        $id = media_handle_sideload($file_array, $post_id, $desc);
+        $src = $id;
+
+        unset($file_array);
+
+        if ( is_wp_error($id) ) {
+            $errors['upload_error'] = $id;
+            return $id;
+        }
+    }
+
+    if ( !empty($src) ) {
+        $alt = @$desc;
+        $html = "<img src='$src' alt='$alt' />";
+        return $html;
+    }
-}
-
@@ -861 +868 @@
-            post_params : {
-                "post_id" : "<?php echo $post_id; ?>",
-
+if ( is_ssl() ) echo $_COOKIE[SECURE_AUTH_COOKIE]; else 
-                "_wpnonce" : "<?php echo wp_create_nonce('media-form'); ?>",
-                "type" : "<?php echo $type; ?>",

branches/crazyhorse/wp-admin/includes/misc.php

@@ -68 +68 @@
-        }
-        if (!$foundit) {
-
+\n
-            foreach ( $insertion as $insertline )
-                fwrite( $f, "{$insertline}\n" );

branches/crazyhorse/wp-admin/includes/schema.php

@@ -154 +154 @@
-function populate_options() {
-    global $wpdb, $wp_db_version;
-
-
-
+
+
-    
-    do_action('populate_options');
@@ -256 +255 @@
-    // 2.6
-    add_option('avatar_default', 'mystery');
-
-
+ 
+ 
-    
-    // Delete unused options

branches/crazyhorse/wp-admin/includes/template.php

@@ -758 +758 @@
-    $actions = array();
-
-    $actions['approve']   = "<a href='$approve_url' class='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3' title='" . __( 'Approve this comment' ) . "'>" . __( 'Approve' ) . '</a> | ';
-    $actions['unapprove'] = "<a href='$unapprove_url' class='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3' title='" . __( 'Unapprove this comment' ) . "'>" . __( 'Unapprove' ) . '</a> | ';
-
-    // we're looking at list of only approved or only unapproved comments
-    if ( 'moderated' == $comment_status ) {
-        $actions['approve'] = "<a href='$approve_url' class='delete:the-comment-list:comment-$comment->comment_ID:e7e7d3:action=dim-comment' title='" . __( 'Approve this comment' ) . "'>" . __( 'Approve' ) . '</a> | ';
-        unset($actions['unapprove']);
-    } elseif ( 'approved' == $comment_status ) {
-        $actions['unapprove'] = "<a href='$unapprove_url' class='delete:the-comment-list:comment-$comment->comment_ID:e7e7d3:action=dim-comment' title='" . __( 'Unapprove this comment' ) . "'>" . __( 'Unapprove' ) . '</a> | ';
-        unset($actions['approve']);
-    }
-
-    if ( current_user_can('edit_post', $comment->comment_post_ID) ) {
+        $actions['approve']   = "<a href='$approve_url' class='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3' title='" . __( 'Approve this comment' ) . "'>" . __( 'Approve' ) . '</a> | ';
+        $actions['unapprove'] = "<a href='$unapprove_url' class='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3' title='" . __( 'Unapprove this comment' ) . "'>" . __( 'Unapprove' ) . '</a> | ';
+
+        // we're looking at list of only approved or only unapproved comments
+        if ( 'moderated' == $comment_status ) {
+            $actions['approve'] = "<a href='$approve_url' class='delete:the-comment-list:comment-$comment->comment_ID:e7e7d3:action=dim-comment' title='" . __( 'Approve this comment' ) . "'>" . __( 'Approve' ) . '</a> | ';
+            unset($actions['unapprove']);
+        } elseif ( 'approved' == $comment_status ) {
+            $actions['unapprove'] = "<a href='$unapprove_url' class='delete:the-comment-list:comment-$comment->comment_ID:e7e7d3:action=dim-comment' title='" . __( 'Unapprove this comment' ) . "'>" . __( 'Unapprove' ) . '</a> | ';
+            unset($actions['approve']);
+        }
+
-        $actions['edit']      = "<a href='comment.php?action=editcomment&amp;c={$comment->comment_ID}' title='" . __('Edit comment') . "'>". __('Edit') . '</a> | ';
-        $actions['spam']      = "<a href='$spam_url' class='delete:the-comment-list:comment-$comment->comment_ID::spam=1' title='" . __( 'Mark this comment as spam' ) . "'>" . __( 'Spam' ) . '</a> | ';
-        $actions['delete']    = "<a href='$delete_url' class='delete:the-comment-list:comment-$comment->comment_ID delete'>" . __('Delete') . '</a>';
+        $actions = apply_filters( 'comment_row_actions', $actions, $comment );
-        foreach ( $actions as $action => $link )
-            echo "<span class='$action'>$link</span>";
@@ -912 +913 @@
-<tr class="submit"><td colspan="3">
-    <?php wp_nonce_field( 'add-meta', '_ajax_nonce', false ); ?>
-::post_id=<?php echo $GLOBALS['post_ID'] ? $GLOBALS['post_ID'] : $GLOBALS['temp_ID']; ?>
+
-</td></tr>
-</table>

branches/crazyhorse/wp-admin/includes/upgrade.php

@@ -7 +7 @@
-
-if ( !function_exists('wp_install') ) :
-remote
+deprecated=''
-    global $wp_rewrite;
-
@@ -19 +19 @@
-    update_option('admin_email', $user_email);
-    update_option('blog_public', $public);
-
-
-
-
-
-
-
-
-
+
+
-
-    update_option('siteurl', $guessurl);
@@ -212 +205 @@
-        upgrade_252();
-
-000
+201
-        upgrade_260();
-
@@ -750 +743 @@
-
-function upgrade_260() {
-
+
+
+
+
+
+
+
-}
-
@@ -882 +881 @@
-    global $wpdb;
-
-e
+a
-    if( !is_array($queries) ) {
-        $queries = explode( ';', $queries );

branches/crazyhorse/wp-admin/includes/user.php

@@ -355 +355 @@
-    function do_paging() {
-        if ( $this->total_users_for_query > $this->users_per_page ) { // have to page the results
+            $args = array();
+            if( ! empty($this->search_term) )
+                $args['usersearch'] = urlencode($this->search_term);
+            if( ! empty($this->role) )
+                $args['role'] = urlencode($this->role);
+
-            $this->paging_text = paginate_links( array(
-                'total' => ceil($this->total_users_for_query / $this->users_per_page),
@@ -360 +366 @@
-                'base' => 'users.php?%_%',
-                'format' => 'userspage=%#%',
-array( 'usersearch' => urlencode($this->search_term) )
+$args
-            ) );
-        }

branches/crazyhorse/wp-admin/install.php

@@ -54 +54 @@
-            <td colspan="2"><label><input type="checkbox" name="blog_public" value="1" checked="checked" /> <?php _e('Allow my blog to appear in search engines like Google and Technorati.'); ?></label></td>
-        </tr>
-        <tr>
-            <td colspan="2"><label><input type="checkbox" name="enable_remotepublishing" value="0" /> <?php _e('Enable remote publishing using the WordPress, Movable Type, MetaWeblog, Blogger and Atom publishing protocols for my blog.'); ?></label></td>
-        </tr>
-    </table>
-    </table>
-    <input type="submit" name="Submit" value="<?php _e('Install WordPress'); ?>" class="button" />
@@ -73 +69 @@
-        $admin_email = stripslashes($_POST['admin_email']);
-        $public = (int) $_POST['blog_public'];
-        $remote = (int) $_POST['enable_remotepublishing'];
-        // check e-mail address
-        if (empty($admin_email)) {
@@ -84 +79 @@
-
-        $wpdb->show_errors();
-, $remote
+
-        extract($result, EXTR_SKIP);
-?>

branches/crazyhorse/wp-admin/js/editor.js

@@ -53 +53 @@
-        content = content.replace(new RegExp('\\s*<div', 'mg'), '\n<div');
-        content = content.replace(new RegExp('</div>\\s*', 'mg'), '</div>\n');
+        content = content.replace(new RegExp('\\s*\\[wp_caption([^\\[]+)\\[/wp_caption\\]\\s*', 'gi'), '\n\n[wp_caption$1[/wp_caption]\n\n');
-
-        var blocklist2 = 'blockquote|ul|ol|li|table|thead|tr|th|td|h[1-6]|pre';
@@ -70 +71 @@
-        // Trim whitespace
-        content = content.replace(new RegExp('^\\s*', ''), '');
-\\s
+[\\s\\u00a0]
-
-        // put back the line breaks in pre|script
@@ -165 +166 @@
-        pee = pee.replace(new RegExp('(</?(?:'+blocklist+')[^>]*>)\\s*<br />', 'gi'), "$1");
-        pee = pee.replace(new RegExp('<br />(\\s*</?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)>)', 'gi'), '$1');
+        pee = pee.replace(new RegExp('(?:<p>|<br ?/?>)*\\s*\\[wp_caption([^\\[]+)\\[/wp_caption\\]\\s*(?:</p>|<br ?/?>)*', 'gi'), '[wp_caption$1[/wp_caption]');
-        // pee = pee.replace(new RegExp('^((?:&nbsp;)*)\\s', 'mg'), '$1&nbsp;');
-

branches/crazyhorse/wp-admin/js/media-upload.js

@@ -1 +1 @@
-// send html to the post editor
-function send_to_editor(h) {
-
+
+
+
+
-
-
-
-
-
+
+
-    } else
-
+
+
+
-}
-
@@ -23 +26 @@
-            $('#TB_iframeContent').width( W - 50 ).height( H - 75 );
-            tbWindow.css({'margin-left': '-' + parseInt((( W - 50 ) / 2),10) + 'px'});
-! ( $.browser.msie && $.browser.version.substr(0,1) < 7 )
+typeof document.body.style.maxWidth != 'undefined'
-                tbWindow.css({'top':'20px','margin-top':'0'});
-            $('#TB_title').css({'background-color':'#222','color':'#cfcfcf'});
@@ -36 +39 @@
-        });
-    };
+    
+    jQuery('a.thickbox').click(function(){
+        if ( typeof tinyMCE != 'undefined' &&  tinyMCE.activeEditor ) {
+            tinyMCE.get('content').focus();
+            tinyMCE.activeEditor.windowManager.bookmark = tinyMCE.activeEditor.selection.getBookmark('simple');
+        }
+    });
-
-    $(window).resize( function() { tb_position() } );

branches/crazyhorse/wp-admin/js/post.js

@@ -99 +99 @@
-
-    // auto-suggest stuff
-
+, multiple: true, multipleSep: ", "
-    jQuery('#newtag').keypress( tag_press_key );
-
@@ -182 +182 @@
-            autosave_update_post_ID(s.parsed.responses[0].supplemental.postid);
-        }
-
+
+
+
+
+
-});

branches/crazyhorse/wp-admin/js/theme-preview.js

@@ -13 +13 @@
-            $('#TB_iframeContent').width( W - 90 ).height( H - 90 );
-            tbWindow.css({'margin-left': '-' + parseInt((( W - 90 ) / 2),10) + 'px'});
-! ( $.browser.msie && $.browser.version.substr(0,1) < 7 )
+typeof document.body.style.maxWidth != 'undefined'
-                tbWindow.css({'top':'30px','margin-top':'0'});
-        };

branches/crazyhorse/wp-admin/options-writing.php

@@ -134 +134 @@
-<p class="submit">
-<input type="hidden" name="action" value="update" />
-