Changes from tags/3.0.1 at r16644 to tags/3.0.2 at r16644

Location:

tags/3.0.2

Files:

• readme.html (modified) (2 diffs)
• wp-admin/includes/file.php (modified) (1 diff)
• wp-admin/includes/plugin.php (modified) (2 diffs)
• wp-admin/includes/update-core.php (modified) (1 diff)
• wp-admin/plugins.php (modified) (2 diffs)
• wp-includes/canonical.php (modified) (2 diffs)
• wp-includes/capabilities.php (modified) (3 diffs)
• wp-includes/comment.php (modified) (3 diffs)
• wp-includes/functions.php (modified) (1 diff)
• wp-includes/load.php (modified) (1 diff)
• wp-includes/ms-files.php (modified) (2 diffs)
• wp-includes/version.php (modified) (1 diff)

tags/3.0.2/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.0.1
+    <br /> Version 3.0.2
 </h1>
 <p style="text-align: center">Semantic Personal Publishing Platform</p>
@@ -103 +103 @@
 
 <h1>Copyright</h1>
-<p>WordPress is released under the <abbr title="GNU Public License">GPL</abbr>v2 (see <a href="license.txt">license.txt</a>).</p>
+<p>WordPress is released under the <abbr title="GNU Public License">GPL</abbr> (see <a href="license.txt">license.txt</a>).</p>
 
 

tags/3.0.2/wp-admin/includes/file.php

@@ -938 +938 @@
         if ( is_wp_error($error) )
             $error_string = $error->get_error_message();
-        echo '<div id="message" class="error"><p>' . $error_string . '</p></div>';
+        echo '<div id="message" class="error"><p>' . esc_html( $error_string ) . '</p></div>';
     }
 

tags/3.0.2/wp-admin/includes/plugin.php

@@ -484 +484 @@
         include(WP_PLUGIN_DIR . '/' . $plugin);
         do_action( 'activate_plugin', trim( $plugin) );
+        do_action( 'activate_' . trim( $plugin ) );
         if ( $network_wide ) {
             $current[$plugin] = time();
@@ -492 +493 @@
             update_option('active_plugins', $current);
         }
-        do_action( 'activate_' . trim( $plugin ) );
         do_action( 'activated_plugin', trim( $plugin) );
         if ( ob_get_length() > 0 ) {

tags/3.0.2/wp-admin/includes/update-core.php

@@ -275 +275 @@
     $required_php_version = '4.3';
     $required_mysql_version = '4.1.2';
-    $wp_version = '3.0.1';
+    $wp_version = '3.0.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' );

tags/3.0.2/wp-admin/plugins.php

@@ -256 +256 @@
                             if ( $plugin['is_uninstallable'] ) {
                                 /* translators: 1: plugin name, 2: plugin author */
-                                echo '<li>', sprintf( __( '<strong>%1$s</strong> by <em>%2$s</em> (will also <strong>delete its data</strong>)' ), $plugin['Name'], $plugin['Author'] ), '</li>';
+                                echo '<li>', sprintf( __( '<strong>%1$s</strong> by <em>%2$s</em> (will also <strong>delete its data</strong>)' ), esc_html($plugin['Name']), esc_html($plugin['Author']) ), '</li>';
                                 $data_to_delete = true;
                             } else {
                                 /* translators: 1: plugin name, 2: plugin author */
-                                echo '<li>', sprintf( __('<strong>%1$s</strong> by <em>%2$s</em>' ), $plugin['Name'], $plugin['Author'] ), '</li>';
+                                echo '<li>', sprintf( __('<strong>%1$s</strong> by <em>%2$s</em>' ), esc_html($plugin['Name']), esc_html($plugin['Author']) ), '</li>';
                             }
                         }
@@ -290 +290 @@
                     <?php
                         foreach ( (array)$files_to_delete as $file )
-                            echo '<li>' . str_replace(WP_PLUGIN_DIR, '', $file) . '</li>';
+                            echo '<li>' . esc_html(str_replace(WP_PLUGIN_DIR, '', $file)) . '</li>';
                     ?>
                     </ul>

tags/3.0.2/wp-includes/canonical.php

@@ -104 +104 @@
             if ( $redirect_url = get_permalink(get_query_var('p')) )
                 $redirect['query'] = remove_query_arg(array('p', 'post_type'), $redirect['query']);
-            if ( get_query_var( 'page' ) ) {
-                $redirect_url = trailingslashit( $redirect_url ) . user_trailingslashit( get_query_var( 'page' ), 'single_paged' );
-                $redirect['query'] = remove_query_arg( 'page', $redirect['query'] );
-            }
         } elseif ( is_single() && !empty($_GET['name'])  && ! $redirect_url ) {
             if ( $redirect_url = get_permalink( $wp_query->get_queried_object_id() ) )
@@ -181 +177 @@
             }
         } elseif ( is_single() && strpos($wp_rewrite->permalink_structure, '%category%') !== false ) {
-            $category = get_term_by('slug', get_query_var('category_name'), 'category');
+            $category = get_category_by_path(get_query_var('category_name'));
             $post_terms = wp_get_object_terms($wp_query->get_queried_object_id(), 'category', array('fields' => 'tt_ids'));
             if ( (!$category || is_wp_error($category)) || ( !is_wp_error($post_terms) && !empty($post_terms) && !in_array($category->term_taxonomy_id, $post_terms) ) )
                 $redirect_url = get_permalink($wp_query->get_queried_object_id());
+        }
+
+        // Post Paging
+        if ( is_singular() && get_query_var('page') && $redirect_url ) {
+            $redirect_url = trailingslashit( $redirect_url ) . user_trailingslashit( get_query_var( 'page' ), 'single_paged' );
+            $redirect['query'] = remove_query_arg( 'page', $redirect['query'] );
         }
 

tags/3.0.2/wp-includes/capabilities.php

@@ -799 +799 @@
     case 'remove_user':
         $caps[] = 'remove_users';
-        break;
-    case 'delete_user':
-        $caps[] = 'delete_users';
         break;
     case 'promote_user':
@@ -1029 +1026 @@
     case 'delete_users':
         // If multisite these caps are allowed only for super admins.
-        if ( is_multisite() && !is_super_admin( $user_id ) )
+        if ( is_multisite() && !is_super_admin( $user_id ) ) {
             $caps[] = 'do_not_allow';
-        else
+        } else {
+            if ( 'delete_user' == $cap )
+                $cap = 'delete_users';
             $caps[] = $cap;
+        }
         break;
     case 'create_users':
@@ -1080 +1080 @@
     $current_user = wp_get_current_user();
 
-    if ( is_multisite() && is_super_admin() )
-        return true;
-
     if ( empty( $current_user ) )
         return false;

tags/3.0.2/wp-includes/comment.php

@@ -19 +19 @@
  * then the check fails.
  *
- * If the comment is a trackback and part of the blogroll, then the trackback is
- * automatically whitelisted. If the comment author was approved before, then
- * the comment is automatically whitelisted.
+ * If the comment author was approved before, then the comment is
+ * automatically whitelisted.
  *
  * If none of the checks fail, then the failback is to set the check to pass
@@ -81 +80 @@
     // Comment whitelisting:
     if ( 1 == get_option('comment_whitelist')) {
-        if ( 'trackback' == $comment_type || 'pingback' == $comment_type ) { // check if domain is in blogroll
-            $uri = parse_url($url);
-            $domain = $uri['host'];
-            $uri = parse_url( home_url() );
-            $home_domain = $uri['host'];
-            if ( $wpdb->get_var($wpdb->prepare("SELECT link_id FROM $wpdb->links WHERE link_url LIKE (%s) LIMIT 1", '%'.$domain.'%')) || $domain == $home_domain )
-                return true;
-            else
-                return false;
-        } elseif ( $author != '' && $email != '' ) {
+        if ( 'trackback' != $comment_type && 'pingback' != $comment_type && $author != '' && $email != '' ) {
             // expected_slashed ($author, $email)
             $ok_to_comment = $wpdb->get_var("SELECT comment_approved FROM $wpdb->comments WHERE comment_author = '$author' AND comment_author_email = '$email' and comment_approved = '1' LIMIT 1");
@@ -1655 +1645 @@
                 $pinged[] = $tb_ping;
             } else {
-                $wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET to_ping = TRIM(REPLACE(to_ping, '$tb_ping', '')) WHERE ID = %d", $post_id) );
+                $wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET to_ping = TRIM(REPLACE(to_ping, %s, '')) WHERE ID = %d", $tb_ping, $post_id) );
             }
         }

tags/3.0.2/wp-includes/functions.php

@@ -2126 +2126 @@
     $upload_path = get_option( 'upload_path' );
     $upload_path = trim($upload_path);
-    $main_override = defined( 'MULTISITE' ) && is_main_site();
+    $main_override = is_multisite() && defined( 'MULTISITE' ) && is_main_site();
     if ( empty($upload_path) ) {
         $dir = WP_CONTENT_DIR . '/uploads';

tags/3.0.2/wp-includes/load.php

@@ -580 +580 @@
         return MULTISITE;
 
-    if ( defined( 'VHOST' ) || defined( 'SUNRISE' ) )
+    if ( defined( 'SUBDOMAIN_INSTALL' ) || defined( 'VHOST' ) || defined( 'SUNRISE' ) )
         return true;
 

tags/3.0.2/wp-includes/ms-files.php

@@ -30 +30 @@
 }
 
-$mime = wp_check_filetype( $_SERVER[ 'REQUEST_URI' ] );
+$mime = wp_check_filetype( $file );
 if( false === $mime[ 'type' ] && function_exists( 'mime_content_type' ) )
     $mime[ 'type' ] = mime_content_type( $file );
@@ -37 +37 @@
     $mimetype = $mime[ 'type' ];
 else
-    $mimetype = 'image/' . substr( $_SERVER[ 'REQUEST_URI' ], strrpos( $_SERVER[ 'REQUEST_URI' ], '.' ) + 1 );
+    $mimetype = 'image/' . substr( $file, strrpos( $file, '.' ) + 1 );
 
 header( 'Content-type: ' . $mimetype ); // always send this

tags/3.0.2/wp-includes/version.php

@@ -9 +9 @@
  * @global string $wp_version
  */
-$wp_version = '3.0.1';
+$wp_version = '3.0.2';
 
 /**