Changeset 1324

Timestamp:

06/10/08 14:08:54 (4 months ago)

Author:

donncha

Message:

Merge with branches/2.5 in WordPress?, revision 8066

Files:

• trunk/wp-admin/async-upload.php (modified) (2 diffs)
• trunk/wp-admin/comment.php (modified) (1 diff)
• trunk/wp-admin/css/media.css (modified) (2 diffs)
• trunk/wp-admin/css/widgets-rtl.css (modified) (1 diff)
• trunk/wp-admin/css/widgets.css (modified) (7 diffs)
• trunk/wp-admin/edit-comments.php (modified) (1 diff)
• trunk/wp-admin/includes/dashboard.php (modified) (1 diff)
• trunk/wp-admin/includes/media.php (modified) (8 diffs)
• trunk/wp-admin/includes/upgrade.php (modified) (2 diffs)
• trunk/wp-admin/includes/widgets.php (modified) (2 diffs)
• trunk/wp-admin/js/link.js (modified) (1 diff)
• trunk/wp-admin/js/media-upload.js (modified) (2 diffs)
• trunk/wp-admin/js/widgets.js (modified) (2 diffs)
• trunk/wp-admin/media.php (modified) (1 diff)
• trunk/wp-admin/menu.php (modified) (1 diff)
• trunk/wp-admin/plugins.php (modified) (1 diff)
• trunk/wp-admin/update.php (modified) (1 diff)
• trunk/wp-admin/user-edit.php (modified) (1 diff)
• trunk/wp-admin/widgets.php (modified) (1 diff)
• trunk/wp-content/themes/classic/index.php (modified) (1 diff)
• trunk/wp-includes/comment.php (modified) (1 diff)
• trunk/wp-includes/functions.php (modified) (2 diffs)
• trunk/wp-includes/general-template.php (modified) (1 diff)
• trunk/wp-includes/js/swfupload/handlers.js (modified) (1 diff)
• trunk/wp-includes/js/thickbox/thickbox.css (modified) (3 diffs)
• trunk/wp-includes/link-template.php (modified) (2 diffs)
• trunk/wp-includes/media.php (modified) (2 diffs)
• trunk/wp-includes/post.php (modified) (8 diffs)
• trunk/wp-includes/rewrite.php (modified) (1 diff)
• trunk/wp-includes/script-loader.php (modified) (4 diffs)
• trunk/wp-includes/taxonomy.php (modified) (4 diffs)
• trunk/wp-includes/version.php (modified) (2 diffs)
• trunk/wp-includes/widgets.php (modified) (1 diff)

trunk/wp-admin/async-upload.php

@@ -16 +16 @@
-require_once('admin.php');
-
-'
+; charset=' . get_option('blog_charset')
-
-if ( !current_user_can('upload_files') )
@@ -26 +26 @@
-        exit;
-}
+
+check_admin_referer('media-form');
-
-$id = media_handle_upload('async-upload', $_REQUEST['post_id']);

trunk/wp-admin/comment.php

@@ -194 +194 @@
-        wp_set_comment_status( $comment->comment_ID, 'approve' );
-
-        if ( true == get_option('comments_notify') )
-                wp_notify_postauthor( $comment->comment_ID );
-
-
-        if ( '' != wp_get_referer() && false == $noredir )
-                wp_redirect( wp_get_referer() );

trunk/wp-admin/css/media.css

@@ -197 +197 @@
-        margin: 0 1em 1em 0;
-}
+
+#media-upload .media-upload-form p.ml-submit {
+        padding: 1em 0;
+}
+
-#media-upload p.help {
-        font-style: italic;
@@ -241 +246 @@
-        height: 3em;
-}
+
+#media-upload #filter {
+        width: 623px;
+}
+
+#media-upload #filter .subsubsub {
+        margin: 8px 0;
+}
+
+#filter .tablenav select {
+        border-style:solid;
+        border-width:1px;
+        padding:2px;
+        vertical-align:top;
+}

trunk/wp-admin/css/widgets-rtl.css

@@ -39 +39 @@
-}
-
-li.widget-list-control-item div.widget-control {
-        padding:0 0 0 10px;
-}
-ul.widget-control-list div.widget-control-actions {
-        margin-right:0;
-        margin-left:-10px;
-}
-
-
+
+
+
+
-}

trunk/wp-admin/css/widgets.css

@@ -75 +75 @@
-}
-
-
-ul#widget-list li.widget-list-item ul.widget-control-info {
-        display: none;
@@ -92 +91 @@
-}
-
-ul.widget-control-list li {
-        position: relative;
-}
-
-div#current-widgets p.submit {
-        padding: 1em;
@@ -101 +96 @@
-
-li.widget-list-control-item {
-0 0 1em
+1em 0
-        -moz-border-radius: 3px;
-        -khtml-border-radius: 3px;
@@ -108 +103 @@
-}
-
-
+
+
+
-        margin: 0;
-        padding: 0.4em 2.5em 0.4em 0.8em;
-        cursor: move;
-        font-size: 13px;
+        padding: 0.4em 2.5em 0.4em 0.8em;
+        position: relative;
-        -moz-border-radius: 3px;
-        -khtml-border-radius: 3px;
@@ -144 +142 @@
-
-li.widget-list-control-item h4.widget-title a:hover {
-
-        text-decoration: none;
-        border-bottom: none;
@@ -151 +148 @@
-li.widget-list-control-item div.widget-control {
-        display: none;
-
-
+
-        font-size: 11px;
+        position: relative;
+        background-color: #CFEBF7;
-}
-
@@ -162 +160 @@
-
-ul.widget-control-list div.widget-control-actions {
-        margin-right: -10px; /* Correction for padding, margin, border of inputs */
-        margin-left: -6px;
-        border-top-width: 1px;
-        border-top-style: solid;
-
-
-
-
-
+
-}
-

trunk/wp-admin/edit-comments.php

@@ -98 +98 @@
-$status_links = array();
-$num_comments = wp_count_comments();
-$num_comments->moderated), "<span class='comment-count'>$num_comments->moderated
+number_format_i18n($num_comments->moderated) ), "<span class='comment-count'>" . number_format_i18n($num_comments->moderated) . "
-$class = ( '' === $comment_status ) ? ' class="current"' : '';
-$status_links[] = "<li><a href=\"edit-comments.php\"$class>".__('Show All Comments')."</a>";

trunk/wp-admin/includes/dashboard.php

@@ -24 +24 @@
-
-        // Recent Comments Widget
-
+
+
+
-                $notice = sprintf( __ngettext( '%d comment awaiting moderation', '%d comments awaiting moderation', $mod_comments ), $mod_comments );
-                $notice = "<a href='edit-comments.php?comment_status=moderated'>$notice</a>";

trunk/wp-admin/includes/media.php

@@ -56 +56 @@
-
-        if ( $url )
-"<a href='".attribute_escape($url)."'
+'<a href="' . clean_url($url) . "\"
-
-        $html = apply_filters( 'image_send_to_editor', $html, $id, $alt, $title, $align, $url, $size );
@@ -181 +181 @@
-$siteurl = get_option('siteurl');
-echo "<style type='text/css' media='all'>
-1
+ver=20080430
-        div#TB_title {
-                background-color: #222222;
@@ -188 +188 @@
-        div#TB_title a, div#TB_title a:visited {
-                color: #cfcfcf;
+        }
+        #TB_window {
+                top: 20px;
-        }
-</style>\n";
@@ -792 +795 @@
-                                "post_id" : "<?php echo $post_id; ?>",
-                                "auth_cookie" : "<?php echo $_COOKIE[AUTH_COOKIE]; ?>",
+                                "_wpnonce" : "<?php echo wp_create_nonce('media-form'); ?>",
-                                "type" : "<?php echo $type; ?>",
-                                "tab" : "<?php echo $tab; ?>",
@@ -816 +820 @@
-</script>
-
+
-<div id="flash-upload-ui">
-<?php do_action('pre-flash-upload-ui'); ?>
@@ -960 +965 @@
-</div>
-
-<p>
-<ul class="subsubsub">
-<?php
@@ -992 +996 @@
-?>
-</ul>
-</p>
-
-<div class="tablenav">
@@ -1067 +1070 @@
-<?php echo get_media_items(null, $errors); ?>
-</div>
+<p class="ml-submit">
-<input type="submit" class="button savebutton" name="save" value="<?php echo attribute_escape( __( 'Save all changes' ) ); ?>" />
-<input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
+</p>
-</form>
-<?php

trunk/wp-admin/includes/upgrade.php

@@ -205 +205 @@
-        if ( $wp_current_db_version < 7796 )
-                upgrade_251();
+
+        if ( $wp_current_db_version < 7935 )
+                upgrade_252();
-
-        maybe_disable_automattic_widgets();
@@ -746 +749 @@
-        // Make the secret longer
-        update_option('secret', wp_generate_password(64));
+}
+
+function upgrade_252() {
+        global $wpdb;
+
+        $wpdb->query("UPDATE $wpdb->users SET user_activation_key = ''");
-}
-

trunk/wp-admin/includes/widgets.php

@@ -228 +228 @@
-                echo $sidebar_args['before_widget'];
-?>
+                <div class="widget-top">
-                <h4 class="widget-title"><?php echo $widget_title ?>
-
@@ -240 +241 @@
-                        <?php endif; ?>
-
-
+</div>
-
-                <div class="widget-control"<?php if ( $edit ) echo ' style="display: block;"'; ?>>

trunk/wp-admin/js/link.js

@@ -1 +1 @@
-jQuery(document).ready( function() {
+        // close postboxes that should be closed
+        jQuery('.if-js-closed').removeClass('if-js-closed').addClass('closed');
+
-        jQuery('#link_name').focus();
-        // postboxes

trunk/wp-admin/js/media-upload.js

@@ -1 +1 @@
-// send html to the post editor
-function send_to_editor(h) {
-
-
-
+
+
-        tinyMCE = win.tinyMCE;
-        if ( typeof tinyMCE != 'undefined' && ( ed = tinyMCE.getInstanceById('content') ) && !ed.isHidden() ) {
@@ -11 +10 @@
-                win.edInsertContent(win.edCanvas, h);
-}
+
+// thickbox settings
+jQuery(function($) {
+        tb_position = function() {
+                var tbWindow = $('#TB_window');
+                var width = $(window).width();
+                var H = $(window).height();
+                var W = ( 720 < width ) ? 720 : width;
+
+                if ( tbWindow.size() ) {
+                        tbWindow.width( W - 50 ).height( H - 45 );
+                        $('#TB_iframeContent').width( W - 50 ).height( H - 75 );
+                        tbWindow.css({marginLeft: '-' + parseInt((( W - 50 ) / 2),10) + 'px'});
+                };
+
+                return $('a.thickbox').each( function() {
+                        var href = $(this).attr('href');
+                        if ( ! href ) return;
+                        href = href.replace(/&width=[0-9]+/g, '');
+                        href = href.replace(/&height=[0-9]+/g, '');
+                        $(this).attr( 'href', href + '&width=' + ( W - 80 ) + '&height=' + ( H - 85 ) );
+                });
+        };
+
+        $(window).resize( function() { tb_position() } );
+        $(document).ready( function() { tb_position() } );
+});
+

trunk/wp-admin/js/widgets.js

@@ -14 +14 @@
-                                if ( disableFields ) { t.find( ':input:enabled' ).not( '[name="widget-id[]"], [name*="[submit]"]' ).attr( 'disabled', 'disabled' ); }
-                                li.css( 'marginLeft', 0 );
-
+div').children('
-                        } else {
-                                t.find( ':disabled' ).attr( 'disabled', '' ); // always enable on open
-                                if ( width > 250 )
-                                        li.css( 'marginLeft', ( width - 250 ) * -1 );
-
+div').children('
-                        }
-                        t.toggle();
@@ -29 +29 @@
-                                if ( width > 250 )
-                                        li.animate( { marginLeft: 0 } );
-
+div').children('
-                        } else {
-                                t.find( ':disabled' ).attr( 'disabled', '' ); // always enable on open
-                                if ( width > 250 )
-                                        li.animate( { marginLeft: ( width - 250 ) * -1 } );
-
+div').children('
-                        }
-                        t.animate( { height: 'toggle' } );

trunk/wp-admin/media.php

@@ -93 +93 @@
-<?php wp_nonce_field('media-form'); ?>
-</p>
-
+
-
-</div>

trunk/wp-admin/menu.php

@@ -24 +24 @@
-$awaiting_mod = $awaiting_mod->moderated;
-$menu[15] = array(__('Design'), 'switch_themes', 'themes.php');
-$awaiting_mod
+" . number_format_i18n($awaiting_mod) . "
-$menu[30] = array(__('Settings'), 'manage_options', 'options-general.php');
-$menu[35] = array(__('Plugins'), 'activate_plugins', 'plugins.php');

trunk/wp-admin/plugins.php

@@ -94 +94 @@
-        if ( !empty($active) ) {
-        ?>
-" href="<?php echo wp_nonce_url('plugins.php?action=deactivate-all', 'deactivate-all'); ?>" class="delete
+ delete" href="<?php echo wp_nonce_url('plugins.php?action=deactivate-all', 'deactivate-all'); ?>
-        <?php
-        } elseif ( empty($active) && !empty($inactive) ) {
-        ?>
-" href="<?php echo wp_nonce_url('plugins.php?action=reactivate-all', 'reactivate-all'); ?>" class="delete
+ delete" href="<?php echo wp_nonce_url('plugins.php?action=reactivate-all', 'reactivate-all'); ?>
-        <?php
-        } // endif active/inactive plugin check

trunk/wp-admin/update.php

@@ -23 +23 @@
-        $credentials['username'] = defined('FTP_USER') ? FTP_USER : (!empty($_POST['username']) ? $_POST['username'] : $credentials['username']);
-        $credentials['password'] = defined('FTP_PASS') ? FTP_PASS : (!empty($_POST['password']) ? $_POST['password'] : $credentials['password']);
-!empty
+ isset
-
-        if ( ! $error && !empty($credentials['password']) && !empty($credentials['username']) && !empty($credentials['hostname']) ) {

trunk/wp-admin/user-edit.php

@@ -172 +172 @@
-<td>
-<?php
-
+, $user_id
-if ( empty($current_color) )
-        $current_color = 'fresh';

trunk/wp-admin/widgets.php

@@ -135 +135 @@
-                        <ul class="widget-control-list">
-                                <li class="widget-list-control-item">
+                                        <div class="widget-top">
-                                        <h4 class="widget-title"><?php echo $control['name']; ?></h4>
+                                        </div>
-                                        <div class="widget-control" style="display: block;">
-        <?php

trunk/wp-content/themes/classic/index.php

@@ -28 +28 @@
-<?php endif; ?>
-
-Older Posts'), __('New
+Newer Posts'), __('Old
-
-<?php get_footer(); ?>

trunk/wp-includes/comment.php

@@ -727 +727 @@
-                case 'approve':
-                        $query = "UPDATE $wpdb->comments SET comment_approved='1' WHERE comment_ID='$comment_id' LIMIT 1";
+                        if ( get_option('comments_notify') ) {
+                                $comment = get_comment($comment_id);
+                                wp_notify_postauthor($comment_id, $comment->comment_type);
+                        }
+
-                        break;
-                case 'spam':

trunk/wp-includes/functions.php

@@ -1432 +1432 @@
-}
-
+
-function _mce_set_direction( $input ) {
-        global $wp_locale;
@@ -1443 +1444 @@
-        return $input;
-}
+
-
-function smilies_init() {

trunk/wp-includes/general-template.php

@@ -344 +344 @@
-
-        if ('link' == $format)
-return
+$link_html =
-        elseif ('option' == $format)
-return
+$link_html =
-        elseif ('html' == $format)
-return
+$link_html =
-        else // custom
-
+
+
+
+
+
-}
-

trunk/wp-includes/js/swfupload/handlers.js

@@ -56 +56 @@
-
-        // Also bind toggle to the links
-
+, function(){window.scrollTo(0,this.parentNode.offsetTop);}
-
-        // Bind AJAX to the new Delete button

trunk/wp-includes/js/thickbox/thickbox.css

@@ -46 +46 @@
-#TB_window {
-        position: fixed;
-        background: #ffffff;
-        z-index: 102;
-        color:#000000;
-        display:none;
-        border: 4px solid #525252;
-        text-align:left;
-50%
+20px
-        left:50%;
-}
@@ -58 +56 @@
-* html #TB_window { /* ie6 hack */
-position: absolute;
-0 - parseInt(this.offsetHeight / 2
+20
-}
-
@@ -98 +96 @@
-        background-color:#e8e8e8;
-        height:27px;
+        border-width: 4px;
+        border-color: #525252;
+        border-style: solid solid none;
-}
-

trunk/wp-includes/link-template.php

@@ -185 +185 @@
-                        $name = $object->post_name;
-                if (strpos($parentlink, '?') === false)
-trailingslashit($parentlink) . $name . '/'
+user_trailingslashit( trailingslashit($parentlink) . $name )
-        }
-
@@ -403 +403 @@
-                else
-                        $feed_link = "feed/$feed";
-$link
+trailingslashit($link)
-        }
-

trunk/wp-includes/media.php

@@ -91 +91 @@
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-function get_image_tag($id, $alt, $title, $align, $size='medium') {
-
@@ -97 +113 @@
-        $hwstring = image_hwstring($width, $height);
-
-
-
-
-
+
+
+
+
+
+
-
-        return $html;

trunk/wp-includes/post.php

@@ -200 +200 @@
- * @since 2.5
- *
-
-
+
- * @return array of ancestor IDs
- */
-function get_post_ancestors($post) {
-
+$post
-
-        if ( !empty($post->ancestors) )
@@ -1165 +1164 @@
- * @return int post ID or 0 on error
- */
-
+, $wp_error = false
-        global $wpdb, $wp_rewrite, $user_ID;
-
@@ -1188 +1187 @@
-        }
-
-
-
+
+
+
+
+
+
-
-        // Make sure we set a valid category
@@ -1286 +1289 @@
-                        do {
-                                $alt_post_name = substr($post_name, 0, 200-(strlen($suffix)+1)). "-$suffix";
-
-
+
-                                $suffix++;
-                        } while ($post_name_check);
@@ -1301 +1303 @@
-        if ($update) {
-                do_action( 'pre_post_update', $post_ID );
-
+
+
+
+
+
+
-        } else {
-                $data['post_mime_type'] = stripslashes( $post_mime_type ); // This isn't in the update
-
+
+
+
+
+
+
-                $post_ID = (int) $wpdb->insert_id;
-
@@ -1321 +1333 @@
-        $current_guid = get_post_field( 'guid', $post_ID );
-
- {
+
-                clean_page_cache($post_ID);
-} else {
+else
-                clean_post_cache($post_ID);
-        }
-
-        // Set GUID
@@ -1332 +1343 @@
-
-        $post = get_post($post_ID);
-
+
+
-                $post->page_template = $page_template;
+                $page_templates = get_page_templates();
+                if ( 'default' != $page_template && !in_array($page_template, $page_templates) ) {
+                        if ( $wp_error )
+                                return new WP_Error('invalid_page_template', __('The page template is invalid.'));
+                        else
+                                return 0;
+                }
+                if ( ! update_post_meta($post_ID, '_wp_page_template',  $page_template) )
+                        add_post_meta($post_ID, '_wp_page_template',  $page_template, true);
+        }
-
-        wp_transition_post_status($post_status, $previous_status, $post);
@@ -2944 +2966 @@
-function _save_post_hook($post_id, $post) {
-        if ( $post->post_type == 'page' ) {
-                if ( !empty($post->page_template) )
-                        if ( ! update_post_meta($post_id, '_wp_page_template',  $post->page_template))
-                                add_post_meta($post_id, '_wp_page_template',  $post->page_template, true);
-
-                clean_page_cache($post_id);
-                global $wp_rewrite;

trunk/wp-includes/rewrite.php

@@ -794 +794 @@
-
-                //Default Feed rules - These are require to allow for the direct access files to work with permalink structure starting with %category%
-/
-/
-/
-/
-/
-/
+
+
+
+
+
+
-
-                // Post

trunk/wp-includes/script-loader.php

@@ -81 +81 @@
-                $this->add( 'suggest', '/wp-includes/js/jquery/suggest.js', array('dimensions'), '1.1');
-                $this->add( 'schedule', '/wp-includes/js/jquery/jquery.schedule.js', array('jquery'), '20');
-
-
+-20080430
+-20080430
-                $this->add( 'swfupload-degrade', '/wp-includes/js/swfupload/plugins/swfupload.graceful_degradation.js', array('swfupload'), '2.0.2');
-                $this->localize( 'swfupload-degrade', 'uploadDegradeOptions', array(
@@ -145 +145 @@
-                                'cancel' => __('Cancel'),
-                        ) );
-519
+422
-                        $this->localize( 'post', 'postL10n', array(
-                                'tagsUsed' =>  __('Tags used on this post:'),
@@ -165 +165 @@
-                                        'edit' => __('Edit'),
-                                ) );
-109
+430
-                        $this->localize( 'upload', 'uploadL10n', array(
-                                'browseTitle' => attribute_escape(__('Browse your files')),
@@ -188 +188 @@
-                                'confirmText' => __("Are you sure you want to delete the file '%title%'?\nClick ok to delete or cancel to go back.")
-                        ) );
-