From: Edward Z. Yang Date: Sun, 22 May 2011 10:43:15 +0000 (+0100) Subject: Wordpress 3.1.2 X-Git-Tag: wordpress-3.1.2 X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/commitdiff_plain/f6364df6999f38896cc58171ec4a503f4f2dedcf Wordpress 3.1.2 Signed-off-by: Edward Z. Yang --- diff --git a/readme.html b/readme.html index f501249a..75d36497 100644 --- a/readme.html +++ b/readme.html @@ -8,7 +8,7 @@

WordPress -
Version 3.1.1 +
Version 3.1.2

Semantic Personal Publishing Platform

diff --git a/wp-admin/includes/class-wp-posts-list-table.php b/wp-admin/includes/class-wp-posts-list-table.php index e623ab59..c1b4c344 100644 --- 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( '— ', $level ); ?> >post_status != 'trash' ) { ?>labels->parent_item_colon . ' ' . esc_html( $parent_name ) : ''; ?> diff --git a/wp-admin/includes/update-core.php b/wp-admin/includes/update-core.php index ac5eea29..227baaef 100644 --- 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 aa4eb47f..e2b3f334 100644 --- 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 bf4671b6..98b6fede 100644 --- 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 .= "\n"; } } diff --git a/wp-includes/query.php b/wp-includes/query.php index 87422db4..ed08ebc4 100644 --- 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 cd4b01d9..0a1a4354 100644 --- 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 5ebdd486..14980a3d 100644 --- 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.