3.1.2

git-svn-id: http://svn.automattic.com/wordpress/tags/3.1.2@17716 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Bump
2011-04-26 18:40:40 +00:00 · 2011-04-26 18:30:09 +00:00 · 2011-04-26 18:06:50 +00:00 · 2011-04-26 15:47:16 +00:00 · 2011-04-26 10:20:04 +00:00 · 2011-04-26 10:19:16 +00:00
8 changed files with 14 additions and 11 deletions
--- 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>

--- 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>
--- 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' );

--- 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) ) {
--- 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";
 	}
 }
--- 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;
--- 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)
--- 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.
Author	SHA1	Message	Date
ryan	75d19ef32b	3.1.2 git-svn-id: http://svn.automattic.com/wordpress/tags/3.1.2@17716 1a063a9b-81f0-0310-95a4-ce76da25c4cd	2011-04-26 18:40:40 +00:00
ryan	61e239a533	Bump git-svn-id: http://svn.automattic.com/wordpress/branches/3.1@17712 1a063a9b-81f0-0310-95a4-ce76da25c4cd	2011-04-26 18:30:09 +00:00
ryan	ad2b485a1e	Validate post status against capabilities in press this. Props nacin. for 3.1 git-svn-id: http://svn.automattic.com/wordpress/branches/3.1@17710 1a063a9b-81f0-0310-95a4-ce76da25c4cd	2011-04-26 18:06:50 +00:00
ryan	e13b1c82de	Bump git-svn-id: http://svn.automattic.com/wordpress/branches/3.1@17707 1a063a9b-81f0-0310-95a4-ce76da25c4cd	2011-04-26 15:47:16 +00:00
nacin	fb4caf3e06	Add the filter in display_rows, rather than _display_rows. for 3.1. git-svn-id: http://svn.automattic.com/wordpress/branches/3.1@17705 1a063a9b-81f0-0310-95a4-ce76da25c4cd	2011-04-26 10:20:04 +00:00
nacin	b4a7b06241	Remove vestige code, prevent over-escaping of post titles when using Quick Edit for hierarchical post types. fixes #17218 for the 3.1 branch. git-svn-id: http://svn.automattic.com/wordpress/branches/3.1@17704 1a063a9b-81f0-0310-95a4-ce76da25c4cd	2011-04-26 10:19:16 +00:00
nacin	3aa1494dc6	Apply esc_html properly in Walker_PageDropdown. fixes #17217 for the 3.1 branch. git-svn-id: http://svn.automattic.com/wordpress/branches/3.1@17685 1a063a9b-81f0-0310-95a4-ce76da25c4cd	2011-04-22 18:43:00 +00:00
ryan	5c7e289e0f	Use proper prefix in query. Fixes user queries ordered by post count. Props ziofix, ericmann. fixes #17123 for 3.1 git-svn-id: http://svn.automattic.com/wordpress/branches/3.1@17635 1a063a9b-81f0-0310-95a4-ce76da25c4cd	2011-04-13 17:02:52 +00:00
ryan	d4ad475e82	There is not a NOT operator. Props scribu. fixes #17054 for 3.1 git-svn-id: http://svn.automattic.com/wordpress/branches/3.1@17611 1a063a9b-81f0-0310-95a4-ce76da25c4cd	2011-04-06 16:09:13 +00:00
ryan	aaab3bbdbe	Set is_* flags for AND taxonomy queries. fixes #17054 for 3.1 git-svn-id: http://svn.automattic.com/wordpress/branches/3.1@17607 1a063a9b-81f0-0310-95a4-ce76da25c4cd	2011-04-05 18:50:28 +00:00
ryan	56c6950788	Bump git-svn-id: http://svn.automattic.com/wordpress/branches/3.1@17605 1a063a9b-81f0-0310-95a4-ce76da25c4cd	2011-04-05 18:17:34 +00:00