Changeset 1139 for trunk/wp-admin

Timestamp:

10/30/07 16:49:38 (1 year ago)

Author:

donncha

Message:

Merge with WordPress? 2.3.1

Files:

• trunk/wp-admin/admin-ajax.php (modified) (18 diffs)
• trunk/wp-admin/categories.php (modified) (1 diff)
• trunk/wp-admin/edit-category-form.php (modified) (1 diff)
• trunk/wp-admin/edit-comments.php (modified) (5 diffs)
• trunk/wp-admin/edit-form-advanced.php (modified) (1 diff)
• trunk/wp-admin/edit-link-form.php (modified) (1 diff)
• trunk/wp-admin/edit-pages.php (modified) (3 diffs)
• trunk/wp-admin/edit-post-rows.php (modified) (2 diffs)
• trunk/wp-admin/edit.php (modified) (4 diffs)
• trunk/wp-admin/export.php (modified) (1 diff)
• trunk/wp-admin/import/mt.php (modified) (1 diff)
• trunk/wp-admin/includes/plugin.php (modified) (1 diff)
• trunk/wp-admin/includes/post.php (modified) (4 diffs)
• trunk/wp-admin/includes/schema.php (modified) (2 diffs)
• trunk/wp-admin/includes/template.php (modified) (8 diffs)
• trunk/wp-admin/includes/upgrade.php (modified) (1 diff)
• trunk/wp-admin/includes/user.php (modified) (3 diffs)
• trunk/wp-admin/js/cat.js (modified) (1 diff)
• trunk/wp-admin/js/categories.js (modified) (1 diff)
• trunk/wp-admin/js/custom-fields.js (modified) (1 diff)
• trunk/wp-admin/js/edit-comments.js (modified) (1 diff)
• trunk/wp-admin/js/edit-posts.js (deleted)
• trunk/wp-admin/js/link-cat.js (modified) (1 diff)
• trunk/wp-admin/js/users.js (modified) (1 diff)
• trunk/wp-admin/link-add.php (modified) (1 diff)
• trunk/wp-admin/link-manager.php (modified) (5 diffs)
• trunk/wp-admin/menu.php (modified) (1 diff)
• trunk/wp-admin/page.php (modified) (1 diff)
• trunk/wp-admin/plugins.php (modified) (2 diffs)
• trunk/wp-admin/post.php (modified) (1 diff)
• trunk/wp-admin/setup-config.php (modified) (2 diffs)
• trunk/wp-admin/users.php (modified) (1 diff)
• trunk/wp-admin/wp-admin.css (modified) (1 diff)

trunk/wp-admin/admin-ajax.php

@@ -5 +5 @@
-define('DOING_AJAX', true);
-
+check_ajax_referer();
-if ( !is_user_logged_in() )
-        die('-1');
@@ -11 +12 @@
-add_action( 'shutdown', 'get_out_now', -1 );
-
+function wp_ajax_meta_row( $pid, $mid, $key, $value ) {
+        $value = attribute_escape($value);
+        $key_js = addslashes(wp_specialchars($key, 'double'));
+        $key = attribute_escape($key);
+        $r .= "<tr id='meta-$mid'><td valign='top'>";
+        $r .= "<input name='meta[$mid][key]' tabindex='6' onkeypress='return killSubmit(\"theList.ajaxUpdater(&#039;meta&#039;,&#039;meta-$mid&#039;);\",event);' type='text' size='20' value='$key' />";
+        $r .= "</td><td><textarea name='meta[$mid][value]' tabindex='6' rows='2' cols='30'>$value</textarea></td><td align='center'>";
+        $r .= "<input name='updatemeta' type='button' class='updatemeta' tabindex='6' value='".attribute_escape(__('Update'))."' onclick='return theList.ajaxUpdater(&#039;meta&#039;,&#039;meta-$mid&#039;);' /><br />";
+        $r .= "<input name='deletemeta[$mid]' type='submit' onclick=\"return deleteSomething( 'meta', $mid, '";
+        $r .= js_escape(sprintf(__("You are about to delete the '%s' custom field on this post.\n'OK' to delete, 'Cancel' to stop."), $key_js));
+        $r .= "' );\" class='deletemeta' tabindex='6' value='".attribute_escape(__('Delete'))."' /></td></tr>";
+        return $r;
+}
+
-$id = (int) $_POST['id'];
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-case 'delete-comment' :
-        check_ajax_referer( "delete-comment_$id" );
-        if ( !$comment = get_comment( $id ) )
-                die('0');
@@ -37 +34 @@
-                die('-1');
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        break;
-case 'delete-cat' :
-        check_ajax_referer( "delete-category_$id" );
-        if ( !current_user_can( 'manage_categories' ) )
-                die('-1');
@@ -54 +57 @@
-        break;
-case 'delete-link' :
-        check_ajax_referer( "delete-bookmark_$id" );
-        if ( !current_user_can( 'manage_links' ) )
-                die('-1');
@@ -63 +65 @@
-        break;
-case 'delete-meta' :
-        check_ajax_referer( 'change_meta' );
-        if ( !$meta = get_post_meta_by_id( $id ) )
-                die('0');
@@ -73 +74 @@
-        break;
-case 'delete-post' :
-        check_ajax_referer( "{$action}_$id" );
-        if ( !current_user_can( 'delete_post', $id ) )
-                die('-1');
@@ -79 +79 @@
-        if ( wp_delete_post( $id ) )
-                die('1');
-
-
+
-        break;
-case 'delete-page' :
-        check_ajax_referer( "{$action}_$id" );
-        if ( !current_user_can( 'delete_page', $id ) )
-                die('-1');
@@ -100 +98 @@
-
-        if ( 'unapproved' == wp_get_comment_status($comment->comment_ID) ) {
-                check_ajax_referer( "approve-comment_$id" );
-                if ( wp_set_comment_status( $comment->comment_ID, 'approve' ) )
-                        die('1');
-        } else {
-                check_ajax_referer( "unapprove-comment_$id" );
-                if ( wp_set_comment_status( $comment->comment_ID, 'hold' ) )
-                        die('1');
@@ -111 +107 @@
-        break;
-case 'add-category' : // On the Fly
-        check_ajax_referer( $action );
-        if ( !current_user_can( 'manage_categories' ) )
-                die('-1');
@@ -126 +121 @@
-                        'what' => 'category',
-                        'id' => $cat_id,
-
-
+
-                ) );
-        }
@@ -133 +127 @@
-        break;
-case 'add-link-category' : // On the Fly
-        check_ajax_referer( $action );
-        if ( !current_user_can( 'manage_categories' ) )
-                die('-1');
@@ -144 +137 @@
-                if ( !$cat_id = is_term( $cat_name, 'link_category' ) ) {
-                        $cat_id = wp_insert_term( $cat_name, 'link_category' );
+                        $cat_id = $cat_id['term_id'];
-                }
-                $cat_id = $cat_id['term_id'];
-                $cat_name = wp_specialchars(stripslashes($cat_name));
-                $x->add( array(
-                        'what' => 'link-category',
-                        'id' => $cat_id,
-
-
+
-                ) );
-        }
@@ -157 +149 @@
-        break;
-case 'add-cat' : // From Manage->Categories
-        check_ajax_referer( 'add-category' );
-        if ( !current_user_can( 'manage_categories' ) )
-                die('-1');
@@ -165 +156 @@
-                die('0');
-        $level = 0;
-
+cat_
-        $_cat = $cat;
-
-
-
+category_
+category_
+cat_
-                $level++;
-        }
@@ -176 +167 @@
-        $x = new WP_Ajax_Response( array(
-                'what' => 'cat',
-term_id
+cat_ID
-                'data' => _cat_row( $cat, $level, $cat_full_name ),
-term_id
+cat_ID
-        ) );
-        $x->send();
-        break;
-case 'add-comment' :
-        check_ajax_referer( $action );
-        if ( !current_user_can( 'edit_post', $id ) )
-                die('-1');
-        $search = isset($_POST['s']) ? $_POST['s'] : false;
-- 1: 24
+: 25
-
-        list($comments, $total) = _wp_get_comment_list( $search, $start, 1 );
@@ -209 +199 @@
-        break;
-case 'add-meta' :
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-                        die('0');
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                $key = stripslashes($key);
-                $value = stripslashes($value);
-                $x = new WP_Ajax_Response( array(
-                        'what' => 'meta',
-
-
-
-
-
-
-
+
+
-                        'supplemental' => array('postid' => $meta->post_id)
-                ) );
-
-
+
+
+
-        break;
-case 'add-user' :
-        check_ajax_referer( $action );
-        if ( !current_user_can('edit_users') )
-                die('-1');
@@ -284 +262 @@
-        }
-        $user_object = new WP_User( $user_id );
-
-        $x = new WP_Ajax_Response( array(
-                'what' => 'user',
-                'id' => $user_id,
-                'data' => user_row( $user_object ),
-
-
-
-
+
-        ) );
-        $x->send();
-        break;
-case 'autosave' : // The name of this action is hardcoded in edit_post()
-        check_ajax_referer( $action );
-        $_POST['post_content'] = $_POST['content'];
-        $_POST['post_excerpt'] = $_POST['excerpt'];
@@ -328 +301 @@
-break;
-case 'autosave-generate-nonces' :
-        check_ajax_referer( $action );
-        $ID = (int) $_POST['post_ID'];
-        if($_POST['post_type'] == 'post') {

trunk/wp-admin/categories.php

@@ -103 +103 @@
-        </tr>
-        </thead>
- class="list:cat"
+
-<?php
-cat_rows();

trunk/wp-admin/edit-category-form.php

@@ -10 +10 @@
-        $heading = __('Add Category');
-        $submit_text = __('Add Category »');
- class="add:the-list:"
+
-        $action = 'addcat';
-        $nonce_action = 'add-category';

trunk/wp-admin/edit-comments.php

@@ -103 +103 @@
-                $start = " start='$offset'";
-
-list:comment 
+
-                $i = 0;
-                foreach ( $comments as $comment ) {
+                        get_comment( $comment ); // Cache it
-                        _wp_comment_list_item( $comment->comment_ID, ++$i );
-                }
@@ -112 +113 @@
-if ( $extra_comments ) : ?>
-<div id="extra-comments" style="display:none">
-ol id="the-extra-comment-list" class="list:comment commentlist" style="color:red
+ul id="the-extra-comment-list" class="commentlist
-<?php
-        foreach ( $extra_comments as $comment ) {
-                get_comment( $comment ); // Cache it
-
-
-
-
-
-
-
-
+
+
+
+
-</div>
-<?php endif; // $extra_comments ?>
@@ -153 +150 @@
-        <th scope="col" colspan="3" style="text-align: center">' .  __('Actions') . '</th>
-  </tr>
-
-
+
-                foreach ($comments as $comment) {
-                $post = get_post($comment->comment_post_ID);
@@ -164 +160 @@
-  <tr id="comment-<?php echo $comment->comment_ID; ?>" class='<?php echo $class; ?>'>
-    <td style="text-align: center"><?php if ( current_user_can('edit_post', $comment->comment_post_ID) ) { ?><input type="checkbox" name="delete_comments[]" value="<?php echo $comment->comment_ID; ?>" /><?php } ?></td>
- class="comment-author"
+
-    <td><?php comment_author_email_link() ?></td>
-    <td><a href="edit-comments.php?s=<?php comment_author_IP() ?>&amp;mode=edit"><?php comment_author_IP() ?></a></td>
@@ -178 +174 @@
-        echo "<a href='comment.php?action=editcomment&amp;c=$comment->comment_ID' class='edit'>" .  __('Edit') . "</a>"; } ?></td>
-    <td><?php if ( current_user_can('edit_post', $comment->comment_post_ID) ) {
-
-
+
-                } ?></td>
-  </tr>
-                <?php
-                } // end foreach
-
-
+
-<p class="submit"><input type="submit" name="delete_button" class="delete" value="<?php _e('Delete Checked Comments &raquo;') ?>" onclick="var numchecked = getNumChecked(document.getElementById('deletecomments')); if(numchecked < 1) { alert('<?php echo js_escape(__("Please select some comments to delete")); ?>'); return false } return confirm('<?php echo sprintf(js_escape(__("You are about to delete %s comments permanently \n  'Cancel' to stop, 'OK' to delete.")), "' + numchecked + '"); ?>')" />
-                        <input type="submit" name="spam_button" value="<?php _e('Mark Checked Comments as Spam &raquo;') ?>" onclick="var numchecked = getNumChecked(document.getElementById('deletecomments')); if(numchecked < 1) { alert('<?php echo js_escape(__("Please select some comments to mark as spam")); ?>'); return false } return confirm('<?php echo sprintf(js_escape(__("You are about to mark %s comments as spam \n  'Cancel' to stop, 'OK' to mark as spam.")), "' + numchecked + '"); ?>')" /></p>

trunk/wp-admin/edit-form-advanced.php

@@ -75 +75 @@
-<h3 class="dbx-handle"><?php _e('Categories') ?></h3>
-<div class="dbx-content">
-?php wp_nonce_field( 'add-category', '_ajax_nonce', false ); ?><
- class="list:category"
+
+
-</fieldset>
-

trunk/wp-admin/edit-link-form.php

@@ -43 +43 @@
-<h3 class="dbx-handle"><?php _e('Categories') ?></h3>
-<div class="dbx-content">
-?php wp_nonce_field( 'add-link-category', '_ajax_nonce', false ); ?><
-categorychecklist" class="list:link-category
+
+linkcategorychecklist
-</div>
-</fieldset>

trunk/wp-admin/edit-pages.php

@@ -3 +3 @@
-$title = __('Pages');
-$parent_file = 'edit.php';
-wp-lists
+listman
-require_once('admin-header.php');
-
@@ -21 +21 @@
-
-?>
-
-
-
-
-
+
-<div class="wrap">
+
-<h2><?php
-// Use $_GET instead of is_ since they can override each other
@@ -85 +82 @@
-  </tr>
-  </thead>
- class="list:page"
+
-<?php page_rows(0, 0, $posts, $all); ?>
-  </tbody>

trunk/wp-admin/edit-post-rows.php

@@ -10 +10 @@
-        </tr>
-        </thead>
- class="list:post"
+
-<?php
-$i_post = 0;
-if ( have_posts() ) {
-$bgcolor = '';
-add_filter('the_title','wp_specialchars');
-
-
-
-
+
+
-global $current_user;
-$post_owner = ( $current_user->ID == $post->post_author ? 'self' : 'other' );
@@ -95 +92 @@
-        case 'control_delete':
-                ?>
-:the-list:post-$post->ID delete'
+' onclick=\"return deleteSomething( 'post', " . $id . ", '" . js_escape(sprintf(__("You are about to delete this post '%s'.\n'OK' to delete, 'Cancel' to stop."), get_the_title())) . "' );\"
-                <?php
-                break;

trunk/wp-admin/edit.php

@@ -4 +4 @@
-$title = __('Posts');
-$parent_file = 'edit.php';
-
-
-
+
-require_once('admin-header.php');
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-?>
-
@@ -18 +31 @@
-<?php
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-?>
@@ -117 +163 @@
-<?php include( 'edit-post-rows.php' ); ?>
-
-<form action="" method="post" id="get-extra-posts" class="add:the-extra-list:" style="display:none">
-        <?php wp_nonce_field( 'add-post', '_ajax_nonce', false ); ?>
-</form>
-
-<div id="ajax-response"></div>
-
@@ -134 +176 @@
-        $comments = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE comment_post_ID = $id AND comment_approved != 'spam' ORDER BY comment_date");
-        if ($comments) {
-                // Make sure comments, post, and post_author are cached
-                update_comment_cache($comments);
-                $post = get_post($id);
-                $authordata = get_userdata($post->post_author);
-        ?>
-<h3 id="comments"><?php _e('Comments') ?></h3>
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        echo '</ol>';
- // 
-
+//
+       
-<?php } ?>
-</div>

trunk/wp-admin/export.php

@@ -183 +183 @@
-<!--    contained in this file into your blog -->
-
-?php the_generator('export');?
+!-- generator="wordpress/<?php bloginfo_rss('version') ?>" created="<?php echo date('Y-m-d H:i'); ?>"--
-<rss version="2.0"
-        xmlns:content="http://purl.org/rss/1.0/modules/content/"

trunk/wp-admin/import/mt.php

@@ -139 +139 @@
-                foreach ($authors as $author) {
-                        ++ $j;
-<i>'.$author.'</i
+'.__('Current author:').' <strong>'.$author.'</strong
-                        $this->users_form($j);
-                        echo '</li>';

trunk/wp-admin/includes/plugin.php

@@ -87 +87 @@
-}
-
-function activate_plugin($plugin) {
-                $current = get_option('active_plugins');
-                $plugin = trim($plugin);
-
-                if ( validate_file($plugin) )
-                        return new WP_Error('plugin_invalid', __('Invalid plugin.'));
-                if ( ! file_exists(ABSPATH . PLUGINDIR . '/' . $plugin) )
-                        return new WP_Error('plugin_not_found', __('Plugin file does not exist.'));
-
-                if (!in_array($plugin, $current)) {
-                        wp_redirect(add_query_arg('_error_nonce', wp_create_nonce('plugin-activation-error_' . $plugin), 'plugins.php?error=true&plugin=' . $plugin)); // we'll override this later if the plugin can be included without fatal error
-                        ob_start();
-                        @include(ABSPATH . PLUGINDIR . '/' . $plugin);
-                        $current[] = $plugin;
-                        sort($current);
-                        update_option('active_plugins', $current);
-                        do_action('activate_' . $plugin);
-                        ob_end_clean();
-                }
-
-                return null;
-}
-
-function deactivate_plugins($plugins) {
-        $current = get_option('active_plugins');
-
-        if(!is_array($plugins))
-                $plugins = array($plugins);
-
-        foreach($plugins as $plugin) {
-                array_splice($current, array_search( $plugin, $current), 1 ); // Array-fu!
-                do_action('deactivate_' . trim( $plugin ));
-        }
-
-        update_option('active_plugins', $current);
-}
-
-function deactivate_all_plugins() {
-        $current = get_option('active_plugins');
-        deactivate_plugins($current);
-}
-
-//
-// Menu

trunk/wp-admin/includes/post.php

@@ -349 +349 @@
-                        return false;
-
-                wp_cache_delete($post_ID, 'post_meta');
-
-                $result = $wpdb->query( "
-                                                INSERT INTO $wpdb->postmeta
@@ -365 +363 @@
-        $mid = (int) $mid;
-
-        $post_id = $wpdb->get_var("SELECT post_id FROM $wpdb->postmeta WHERE meta_id = '$mid'");
-        wp_cache_delete($post_id, 'post_meta');
-
-        return $wpdb->query( "DELETE FROM $wpdb->postmeta WHERE meta_id = '$mid'" );
-}
@@ -413 +408 @@
-        if ( in_array($mkey, $protected) )
-                return false;
-
-        $post_id = $wpdb->get_var("SELECT post_id FROM $wpdb->postmeta WHERE meta_id = '$mid'");
-        wp_cache_delete($post_id, 'post_meta');
-
-        $mvalue = maybe_serialize( stripslashes( $mvalue ));
@@ -477 +469 @@
-}
-
-function wp_edit_posts_query( $q = false ) {
-        global $wpdb;
-        if ( false === $q )
-                $q = $_GET;
-        $q['m']   = (int) $q['m'];
-        $q['cat'] = (int) $q['cat'];
-        $post_stati  = array(   //      array( adj, noun )
-                                'draft' => array(__('Draft'), _c('Drafts|manage posts header')),
-                                'future' => array(__('Scheduled'), __('Scheduled posts')),
-                                'pending' => array(__('Pending Review'), __('Pending posts')),
-                                'private' => array(__('Private'), __('Private posts')),
-                                'publish' => array(__('Published'), __('Published posts'))
-                        );
-
-        $avail_post_stati = $wpdb->get_col("SELECT DISTINCT post_status FROM $wpdb->posts WHERE post_type = 'post'");
-
-        $post_status_q = '';
-        $post_status_label = _c('Posts|manage posts header');
-        if ( isset($q['post_status']) && in_array( $q['post_status'], array_keys($post_stati) ) ) {
-                $post_status_label = $post_stati[$q['post_status']][1];
-                $post_status_q = '&post_status=' . $q['post_status'];
-        }
-
-        if ( 'pending' === $q['post_status'] ) {
-                $order = 'ASC';
-                $orderby = 'modified';
-        } elseif ( 'draft' === $q['post_status'] ) {
-                $order = 'DESC';
-                $orderby = 'modified';
-        } else {
-                $order = 'DESC';
-