Changeset 1360

Timestamp:

07/09/08 10:00:15 (5 months ago)

Author:

donncha

Message:

WP Merge with revision 8300

Files:

• trunk/wp-admin/admin-ajax.php (modified) (8 diffs)
• trunk/wp-admin/css/install.css (modified) (3 diffs)
• trunk/wp-admin/gears-manifest.php (modified) (2 diffs)
• trunk/wp-admin/includes/template.php (modified) (1 diff)
• trunk/wp-admin/upgrade.php (modified) (3 diffs)
• trunk/wp-content/themes/classic/style.css (modified) (4 diffs)
• trunk/wp-content/themes/default/style.css (modified) (4 diffs)
• trunk/wp-includes/category-template.php (modified) (4 diffs)
• trunk/wp-includes/deprecated.php (modified) (2 diffs)
• trunk/wp-includes/formatting.php (modified) (3 diffs)
• trunk/wp-includes/js/tinymce/langs/wp-langs.php (modified) (1 diff)
• trunk/wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css (modified) (1 diff)
• trunk/wp-includes/js/tinymce/plugins/wpeditimage/editimage.html (modified) (2 diffs)
• trunk/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js (modified) (4 diffs)
• trunk/wp-includes/js/tinymce/tiny_mce_config.php (modified) (1 diff)
• trunk/wp-includes/media.php (modified) (2 diffs)
• trunk/wp-includes/script-loader.php (modified) (2 diffs)
• trunk/wp-includes/version.php (modified) (1 diff)

trunk/wp-admin/admin-ajax.php

@@ -31 +31 @@
-        check_ajax_referer( "delete-comment_$id" );
-        if ( !$comment = get_comment( $id ) )
-0
+1
-        if ( !current_user_can( 'edit_post', $comment->comment_post_ID ) )
-                die('-1');
-
-
+
+
+
-                $r = wp_set_comment_status( $comment->comment_ID, 'spam' );
-else
+} else {
-                $r = wp_delete_comment( $comment->comment_ID );
+        }
-
-        die( $r ? '1' : '0' );
@@ -47 +50 @@
-                die('-1');
-
+        $cat = get_category( $id );
+        if ( !$cat || is_wp_error( $cat ) )
+                die('1');
+
-        if ( wp_delete_category( $id ) )
-                die('1');
-
+
+
-        break;
-case 'delete-tag' :
@@ -56 +64 @@
-                die('-1');
-
+        $tag = get_term( $id, 'post_tag' );
+        if ( !$tag || is_wp_error( $tag ) )
+                die('1');
+
-        if ( wp_delete_term($id, 'post_tag'))
-                die('1');
-
+
+
-        break;
-case 'delete-link-cat' :
@@ -64 +77 @@
-        if ( !current_user_can( 'manage_categories' ) )
-                die('-1');
+
+        $cat = get_term( $id, 'link_category' );
+        if ( !$cat || is_wp_error( $cat ) )
+                die('1');
-
-        $cat_name = get_term_field('name', $id, 'link_category');
@@ -95 +112 @@
-                die('-1');
-
+        $link = get_bookmark( $id );
+        if ( !$link || is_wp_error( $link ) )
+                die('1');
+
-        if ( wp_delete_link( $id ) )
-                die('1');
-
+
+
-        break;
-case 'delete-meta' :
-        check_ajax_referer( "delete-meta_$id" );
-        if ( !$meta = get_post_meta_by_id( $id ) )
-
+
+
-        if ( !current_user_can( 'edit_post', $meta->post_id ) )
-                die('-1');
@@ -114 +137 @@
-                die('-1');
-
+        if ( !get_post( $id ) )
+                die('1');
+
-        if ( wp_delete_post( $id ) )
-                die('1');
@@ -124 +150 @@
-                die('-1');
-
+        if ( !get_page( $id ) )
+                die('1');
+
-        if ( wp_delete_post( $id ) )
-                die('1');
-
+
+
-        break;
-case 'dim-comment' :
-        if ( !$comment = get_comment( $id ) )
-                die('0');
+
-        if ( !current_user_can( 'edit_post', $comment->comment_post_ID ) )
-                die('-1');
@@ -136 +167 @@
-                die('-1');
-
-
+
+
+
+
+
-                check_ajax_referer( "approve-comment_$id" );
-                if ( wp_set_comment_status( $comment->comment_ID, 'approve' ) )

trunk/wp-admin/css/install.css

@@ -38 +38 @@
-#logo { margin: 6px 0 14px 0px; border-bottom: none;}
-
-
+
+
+
+
+
-
-td input { font-size: 1.5em; }
@@ -46 +50 @@
-.submit input, .button, .button-secondary {
-        font-family: "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif;
-6
-none
+5px 7px 7
+1px solid #a3a3a3
-        margin-left: 0;
-
-
-
-
-
+
+
+
+
-        color: #246;
-        background: #e5e5e5;
@@ -64 +67 @@
-.submit input:hover, .button:hover, .button-secondary:hover {
-        color: #d54e21;
+        border-color: #535353;
-}
-

trunk/wp-admin/gears-manifest.php

@@ -146 +146 @@
-{ "url" : "../wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm?ver=311" },
-{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/template.htm?ver=311" },
-
+b
-{ "url" : "../wp-includes/js/tinymce/wp-mce-help.php?ver=311" },
-
@@ -159 +159 @@
-{ "url" : "../wp-includes/js/tinymce/plugins/paste/css/pasteword.css?ver=311" },
-{ "url" : "../wp-includes/js/tinymce/plugins/paste/css/blank.css?ver=311" },
-
+b
-{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage-rtl.css?ver=311" },
-{ "url" : "../wp-includes/js/tinymce/wordpress.css?ver=311" },

trunk/wp-admin/includes/template.php

@@ -769 +769 @@
-
-        if ( current_user_can('edit_post', $comment->comment_post_ID) ) {
-
-
+:new=approved
+:new=unapproved
-
-                // we're looking at list of only approved or only unapproved comments
-                if ( 'moderated' == $comment_status ) {
-
+&new=approved
-                        unset($actions['unapprove']);
-                } elseif ( 'approved' == $comment_status ) {
-
+&new=unapproved
-                        unset($actions['approve']);
-                }

trunk/wp-admin/upgrade.php

@@ -26 +26 @@
-<h2><?php _e('No Upgrade Required'); ?></h2>
-<p><?php _e('Your WordPress database is already up-to-date!'); ?></p>
-h2 class="step"><a href="<?php echo get_option('home'); ?>/"><?php _e('Continue'); ?></a></h2
+p class="step"><a class="button" href="<?php echo get_option('home'); ?>/"><?php _e('Continue'); ?></a></p
-
-<?php else :
@@ -38 +38 @@
-<p><?php _e('Your WordPress database is out-of-date, and must be upgraded before you can continue.'); ?></p>
-<p><?php _e('The upgrade process may take a while, so please be patient.'); ?></p>
-h2 class="step"><a href="upgrade.php?step=1&amp;backto=<?php echo $goback; ?>"><?php _e('Upgrade WordPress'); ?></a></h2
+p class="step"><a class="button" href="upgrade.php?step=1&amp;backto=<?php echo $goback; ?>"><?php _e('Upgrade WordPress'); ?></a></p
-<?php
-                break;
@@ -58 +58 @@
-<h2><?php _e('Upgrade Complete'); ?></h2>
-        <p><?php _e('Your WordPress database has been successfully upgraded!'); ?></p>
-h2 class="step"><a href="<?php echo $backto; ?>"><?php _e('Continue'); ?></a></h2
+p class="step"><a class="button" href="<?php echo $backto; ?>"><?php _e('Continue'); ?></a></p
-
-<!--

trunk/wp-content/themes/classic/style.css

@@ -323 +323 @@
-/* Captions & aligment */
-.aligncenter,
-l
+iv
-        display: block;
-        margin-left: auto;
@@ -337 +337 @@
-}
-
-_
+-
-        border: 1px solid #ddd;
-        text-align: center;
@@ -349 +349 @@
-}
-
-_
+-
-        margin: 0;
-        padding: 0;
@@ -355 +355 @@
-}
-
-_caption_dd
+-caption p.wp-caption-text
-        font-size: 11px;
-        line-height: 17px;

trunk/wp-content/themes/default/style.css

@@ -641 +641 @@
-/* Captions */
-.aligncenter,
-l
+iv
-        display: block;
-        margin-left: auto;
@@ -647 +647 @@
-}
-
-_
+-
-        border: 1px solid #ddd;
-        text-align: center;
@@ -659 +659 @@
-}
-
-_
+-
-        margin: 0;
-        padding: 0;
@@ -665 +665 @@
-}
-
-_caption_dd
+-caption p.wp-caption-text
-        font-size: 11px;
-        line-height: 17px;

trunk/wp-includes/category-template.php

@@ -1 +1 @@
-<?php
-
-
+, $visited=array()
-        if ( 0 == $id )
-                return '';
@@ -15 +15 @@
-                if ( is_wp_error( $category ) )
-                        return $category;
-
+
+
-                        $chain .= $before.$category->term_id.$after;
-                        $chain .= get_category_children($category->term_id, $before, $after);
@@ -45 +46 @@
-}
-
-
+, $visited = array()
-        $chain = '';
-        $parent = &get_category($id);
@@ -56 +57 @@
-                $name = $parent->cat_name;
-
-
-
+
+
+
+
-
-        if ( $link )

trunk/wp-includes/deprecated.php

@@ -1065 +1065 @@
- * @author Dougal
- * @since 1.0.1
-get_categorie
-get_categorie
+wp_list_bookmark
+wp_list_bookmark
- *
- * @param string $order Sort link categories by 'name' or 'id'
@@ -1072 +1072 @@
- */
-function get_links_list($order = 'name', $deprecated = '') {
-get_categorie
+wp_list_bookmark
-
-        $order = strtolower($order);

trunk/wp-includes/formatting.php

@@ -4 +4 @@
-        global $wp_cockneyreplace;
-        $next = true;
+        $has_pre_parent = false;
-        $output = '';
-        $curl = '';
@@ -27 +28 @@
-                $curl = $textarr[$i];
-
-
+ && !$has_pre_parent
-                        // static strings
-                        $curl = str_replace($static_characters, $static_replacements, $curl);
-                        // regular expressions
-                        $curl = preg_replace($dynamic_characters, $dynamic_replacements, $curl);
-pre') !== false || strpos($curl, '<
+
-                        $next = false;
+                } elseif (strpos($curl, '<pre') !== false) {
+                        $has_pre_parent = true;
+                } elseif (strpos($curl, '</pre>') !== false) {
+                        $has_pre_parent = false;
-                } else {
-                        $next = true;
@@ -1125 +1130 @@
-        if ( empty($text) ) return apply_filters('richedit_pre', '');
-
-
-
+
-        $output = wpautop($output);
-
-
-
-
-
-
-
-
-
+
+
-        return apply_filters('richedit_pre', $output);
-}

trunk/wp-includes/js/tinymce/langs/wp-langs.php

@@ -435 +435 @@
-s120:"' . mce_escape( __('120%') ) . '",
-s130:"' . mce_escape( __('130%') ) . '",
-
+
+
-});
-';

trunk/wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css

@@ -63 +63 @@
-}
-
+#media-upload #basic th.label {
+        padding: 5px 5px 5px 0;
+}
+
-.show-align {
-        height: 200px;

trunk/wp-includes/js/tinymce/plugins/wpeditimage/editimage.html

@@ -8 +8 @@
-<script type="text/javascript" src="../../utils/form_utils.js?ver=311"></script>
-
-
+b
-<link rel="stylesheet" href="../../../../../wp-admin/css/media.css?ver=2.6-beta1" type="text/css" media="all" />
-<script type="text/javascript">
@@ -78 +78 @@
-                        <th valign="top" scope="row" class="label">
-                                <label for="img_title">
-
-
+
-                                </label>
-                        </th>

trunk/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js

@@ -16 +16 @@
-                                        return;
-
-
+ver=311b&
-                                tinymce.DOM.setStyle( ['TB_overlay','TB_window','TB_load'], 'z-index', '999999' );
-                        });
@@ -75 +75 @@
-                _do_shcode : function(co) {
-                        return co.replace(/\[wp_caption([^\]]+)\]([\s\S]+?)\[\/wp_caption\][\s\u00a0]*/g, function(a,b,c){
+                                b = b.replace(/\\'|\\'|\\'/g, ''').replace(/\\"|\\"/g, '"');
+                                c = c.replace(/\\'|\\'/g, ''').replace(/\\"/g, '"');
-                                var id = b.match(/id=['"]([^'"]+)/i), cls = b.match(/align=['"]([^'"]+)/i);
-                                var w = b.match(/width=['"]([0-9]+)/), cap = b.match(/caption=['"]([^'"]+)/i);
@@ -92 +94 @@
-
-                _get_shcode : function(co) {
-[^<]+
+.+?
-                                var id = b.match(/id=['"]([^'"]+)/i), cls = b.match(/class=['"]([^'"]+)/i);
-                                var w = c.match(/width=['"]([0-9]+)/);
@@ -102 +104 @@
-                                if ( ! w || ! cap ) return c;
-                                cls = cls.match(/align[^ '"]+/) || 'alignnone';
+                                cap = cap.replace(/<\S[^<>]*>/gi, '').replace(/'/g, '&#39;').replace(/"/g, '&quot;');
-
-                                return '[wp_caption id="'+id+'" align="'+cls+'" width="'+w+'" caption="'+cap+'"]'+c+'[/wp_caption]';

trunk/wp-includes/js/tinymce/tiny_mce_config.php

@@ -223 +223 @@
-if ( $disk_cache ) {
-
-6
+8
-
-        foreach ( $initArray as $v )

trunk/wp-includes/media.php

@@ -351 +351 @@
-}
-
-wp
-
-wp
+img
+
+img
-        
-        // Allow plugins/themes to override the default caption template.
-wp
+img
-        if ( $output != '' )
-                return $output;
@@ -372 +372 @@
-        if ( $id ) $id = 'id="' . $id . '" ';
-        
-l ' . $id . 'class="wp_
-'<dt class="wp_caption_dt">' . $content . '</dt><dd class="wp_caption_dd">' . $caption . '</dd></dl
+iv ' . $id . 'class="wp-
+$content . '<p class="wp-caption-text">' . $caption . '</p></div
-}
-

trunk/wp-includes/script-loader.php

@@ -38 +38 @@
-
-        // Modify this version when tinyMCE plugins are changed.
-6
+8
-        $scripts->add( 'tiny_mce', '/wp-includes/js/tinymce/tiny_mce_config.php', array('editor_functions'), $mce_version );
-
@@ -228 +228 @@
-        $styles->add( 'widgets', '/wp-admin/css/widgets.css' );
-        $styles->add( 'dashboard', '/wp-admin/css/dashboard.css' );
-
+, array(), '20080708'
-        $styles->add( 'theme-editor', '/wp-admin/css/theme-editor.css' );
-        $styles->add( 'press-this', '/wp-admin/css/press-this.css', array(), '20080704' );

trunk/wp-includes/version.php

@@ -18 +18 @@
-$wp_db_version = 8201;
-
-.
+-
-?>