]> scripts.mit.edu Git - autoinstalls/wordpress.git/commitdiff
scripts.mit.edu / autoinstalls / wordpress.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: b609ea8)
Wordpress 3.1.2 wordpress-3.1.2
authorEdward Z. Yang <ezyang@mit.edu>
Sun, 22 May 2011 10:43:15 +0000 (11:43 +0100)
committerEdward Z. Yang <ezyang@mit.edu>
Sun, 22 May 2011 10:43:15 +0000 (11:43 +0100)
Signed-off-by: Edward Z. Yang <ezyang@mit.edu>
readme.html patch | blob | history
wp-admin/includes/class-wp-posts-list-table.php patch | blob | history
wp-admin/includes/update-core.php patch | blob | history
wp-admin/press-this.php patch | blob | history
wp-includes/post-template.php patch | blob | history
wp-includes/query.php patch | blob | history
wp-includes/user.php patch | blob | history
wp-includes/version.php patch | blob | history

diff --git a/readme.html b/readme.html
index f501249aab7f52f2e22975505ce2af952eb116b6..75d364979ecfc932b6d42708a5fb9f1b41615962 100644 (file)
--- a/readme.html
+++ b/readme.html
@@ -8,7 +8,7 @@
 <body>
 <h1 id="logo">
        <a href="http://wordpress.org/"><img alt="WordPress" src="wp-admin/images/wordpress-logo.png" width="250" height="68" /></a>
-       <br /> Version 3.1.1
+       <br /> Version 3.1.2
 </h1>
 <p style="text-align: center">Semantic Personal Publishing Platform</p>
 
diff --git a/wp-admin/includes/class-wp-posts-list-table.php b/wp-admin/includes/class-wp-posts-list-table.php
index e623ab5932ca76219bce29eff144addeee975cbb..c1b4c3441526c611ab61bc34c5e1328496fdde41 100644 (file)
--- a/wp-admin/includes/class-wp-posts-list-table.php
+++ b/wp-admin/includes/class-wp-posts-list-table.php
@@ -310,6 +310,8 @@ class WP_Posts_List_Table extends WP_List_Table {
                if ( empty( $posts ) )
                        $posts = $wp_query->posts;
 
+               add_filter( 'the_title', 'esc_html' );
+
                if ( $this->hierarchical_display ) {
                        $this->_display_rows_hierarchical( $posts, $this->get_pagenum(), $per_page );
                } else {
@@ -320,8 +322,6 @@ class WP_Posts_List_Table extends WP_List_Table {
        function _display_rows( $posts ) {
                global $post, $mode;
 
-               add_filter( 'the_title', 'esc_html' );
-
                // Create array of post IDs.
                $post_ids = array();
 
@@ -522,7 +522,6 @@ class WP_Posts_List_Table extends WP_List_Table {
                                                }
                                        }
 
-                                       $post->post_title = esc_html( $post->post_title );
                                        $pad = str_repeat( '&#8212; ', $level );
 ?>
                        <td <?php echo $attributes ?>><strong><?php if ( $can_edit_post && $post->post_status != 'trash' ) { ?><a class="row-title" href="<?php echo $edit_link; ?>" title="<?php echo esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $title ) ); ?>"><?php echo $pad; echo $title ?></a><?php } else { echo $pad; echo $title; }; _post_states( $post ); echo isset( $parent_name ) ? ' | ' . $post_type_object->labels->parent_item_colon . ' ' . esc_html( $parent_name ) : ''; ?></strong>
diff --git a/wp-admin/includes/update-core.php b/wp-admin/includes/update-core.php
index ac5eea2960489db593f73b87be5a6381ff2dff22..227baaefafcf40cd755f100ebceef95990d4e5c3 100644 (file)
--- a/wp-admin/includes/update-core.php
+++ b/wp-admin/includes/update-core.php
@@ -294,7 +294,7 @@ function update_core($from, $to) {
        $mysql_version  = $wpdb->db_version();
        $required_php_version = '4.3';
        $required_mysql_version = '4.1.2';
-       $wp_version = '3.1.1';
+       $wp_version = '3.1.2';
        $php_compat     = version_compare( $php_version, $required_php_version, '>=' );
        $mysql_compat   = version_compare( $mysql_version, $required_mysql_version, '>=' ) || file_exists( WP_CONTENT_DIR . '/db.php' );
 
diff --git a/wp-admin/press-this.php b/wp-admin/press-this.php
index aa4eb47f0ec709efe2644e1edb93532e818d172d..e2b3f334db36466d56fad5859ee4d3a16e4aa42a 100644 (file)
--- a/wp-admin/press-this.php
+++ b/wp-admin/press-this.php
@@ -56,7 +56,12 @@ function press_it() {
                }
        }
        // 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) ) {
diff --git a/wp-includes/post-template.php b/wp-includes/post-template.php
index bf4671b6fe0ee775ddb9765f99b3f6d6647598ac..98b6fede780cb6c876461005da5536c596c72366 100644 (file)
--- a/wp-includes/post-template.php
+++ b/wp-includes/post-template.php
@@ -1100,9 +1100,8 @@ class Walker_PageDropdown extends Walker {
                if ( $page->ID == $args['selected'] )
                        $output .= ' selected="selected"';
                $output .= '>';
-               $title = esc_html($page->post_title);
                $title = apply_filters( 'list_pages', $page->post_title );
-               $output .= "$pad$title";
+               $output .= $pad . esc_html( $title );
                $output .= "</option>\n";
        }
 }
diff --git a/wp-includes/query.php b/wp-includes/query.php
index 87422db416de2a063930ceaae1aa5de3be040651..ed08ebc450ec8be5bbebd8aa36aefad0487f8bfa 100644 (file)
--- a/wp-includes/query.php
+++ b/wp-includes/query.php
@@ -1510,7 +1510,7 @@ class WP_Query {
                        $this->parse_tax_query( $qv );
 
                        foreach ( $this->tax_query->queries as $tax_query ) {
-                               if ( 'IN' == $tax_query['operator'] ) {
+                               if ( 'NOT IN' != $tax_query['operator'] ) {
                                        switch ( $tax_query['taxonomy'] ) {
                                                case 'category':
                                                        $this->is_category = true;
diff --git a/wp-includes/user.php b/wp-includes/user.php
index cd4b01d9cecf04e3359d795d40bb0828aa9c8949..0a1a4354ac9271c9b61358302b0c57704ffd5e98 100644 (file)
--- a/wp-includes/user.php
+++ b/wp-includes/user.php
@@ -438,7 +438,7 @@ class WP_User_Query {
                        $where = get_posts_by_author_sql('post');
                        $this->query_from .= " LEFT OUTER JOIN (
                                SELECT post_author, COUNT(*) as post_count
-                               FROM wp_posts
+                               FROM $wpdb->posts
                                $where
                                GROUP BY post_author
                        ) p ON ({$wpdb->users}.ID = p.post_author)
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 5ebdd48620a45367d2a15708cbe7b58ab9e3b986..14980a3d037b73224271549e78db132aaeee190c 100644 (file)
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  * @global string $wp_version
  */
-$wp_version = '3.1.1';
+$wp_version = '3.1.2';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
WordPress autoinstaller for phpBB