Changeset 1916

Timestamp:

04/28/2011 11:40:08 AM (13 months ago)

Author:

Xiping.Wang

Message:

[trunk]upgrade to wordpress 3.1.2

Location:

trunk/blogs

Files:

• readme.html (modified) (1 diff)
• wp-admin/includes/class-wp-posts-list-table.php (modified) (3 diffs)
• wp-admin/includes/update-core.php (modified) (1 diff)
• wp-admin/press-this.php (modified) (1 diff)
• wp-includes/post-template.php (modified) (1 diff)
• wp-includes/query.php (modified) (1 diff)
• wp-includes/user.php (modified) (1 diff)
• wp-includes/version.php (modified) (1 diff)

trunk/blogs/readme.html

@@ -9 +9 @@
 <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>

trunk/blogs/wp-admin/includes/class-wp-posts-list-table.php

@@ -311 +311 @@
                         $posts = $wp_query->posts;
 
+                add_filter( 'the_title', 'esc_html' );
+
                 if ( $this->hierarchical_display ) {
                         $this->_display_rows_hierarchical( $posts, $this->get_pagenum(), $per_page );
@@ -320 +322 @@
         function _display_rows( $posts ) {
                 global $post, $mode;
-
-                add_filter( 'the_title', 'esc_html' );
 
                 // Create array of post IDs.
@@ -523 +523 @@
                                         }
 
-                                        $post->post_title = esc_html( $post->post_title );
                                         $pad = str_repeat( '— ', $level );
 ?>

trunk/blogs/wp-admin/includes/update-core.php

@@ -295 +295 @@
         $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' );

trunk/blogs/wp-admin/press-this.php

@@ -57 +57 @@
         }
         // 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

trunk/blogs/wp-includes/post-template.php

@@ -1101 +1101 @@
                         $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";
         }

trunk/blogs/wp-includes/query.php

@@ -1511 +1511 @@
 
                         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':

trunk/blogs/wp-includes/user.php

@@ -439 +439 @@
                         $this->query_from .= " LEFT OUTER JOIN (
                                 SELECT post_author, COUNT(*) as post_count
-                                FROM wp_posts
+                                FROM $wpdb->posts
                                 $where
                                 GROUP BY post_author

trunk/blogs/wp-includes/version.php

@@ -23 +23 @@
  * @global string $wp_version
  */
-$wp_version = '3.1.1';
+$wp_version = '3.1.2';
 
 /**