Changes in branches/3.0 [16641:15477]
- Location:
- branches/3.0
- Files:
-
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/3.0/readme.html
r16641 r15477 9 9 <h1 id="logo"> 10 10 <a href="http://wordpress.org/"><img alt="WordPress" src="wp-admin/images/wordpress-logo.png" width="250" height="68" /></a> 11 <br /> Version 3.0. 211 <br /> Version 3.0.1 12 12 </h1> 13 13 <p style="text-align: center">Semantic Personal Publishing Platform</p> … … 103 103 104 104 <h1>Copyright</h1> 105 <p>WordPress is released under the <abbr title="GNU Public License">GPL</abbr> (see <a href="license.txt">license.txt</a>).</p>105 <p>WordPress is released under the <abbr title="GNU Public License">GPL</abbr>v2 (see <a href="license.txt">license.txt</a>).</p> 106 106 107 107 -
branches/3.0/wp-admin/includes/file.php
r16641 r15477 938 938 if ( is_wp_error($error) ) 939 939 $error_string = $error->get_error_message(); 940 echo '<div id="message" class="error"><p>' . esc_html( $error_string ). '</p></div>';940 echo '<div id="message" class="error"><p>' . $error_string . '</p></div>'; 941 941 } 942 942 -
branches/3.0/wp-admin/includes/plugin.php
r16641 r15477 484 484 include(WP_PLUGIN_DIR . '/' . $plugin); 485 485 do_action( 'activate_plugin', trim( $plugin) ); 486 do_action( 'activate_' . trim( $plugin ) );487 486 if ( $network_wide ) { 488 487 $current[$plugin] = time(); … … 493 492 update_option('active_plugins', $current); 494 493 } 494 do_action( 'activate_' . trim( $plugin ) ); 495 495 do_action( 'activated_plugin', trim( $plugin) ); 496 496 if ( ob_get_length() > 0 ) { -
branches/3.0/wp-admin/includes/update-core.php
r16641 r15477 275 275 $required_php_version = '4.3'; 276 276 $required_mysql_version = '4.1.2'; 277 $wp_version = '3.0. 2';277 $wp_version = '3.0.1'; 278 278 $php_compat = version_compare( $php_version, $required_php_version, '>=' ); 279 279 $mysql_compat = version_compare( $mysql_version, $required_mysql_version, '>=' ) || file_exists( WP_CONTENT_DIR . '/db.php' ); -
branches/3.0/wp-admin/plugins.php
r16641 r15477 256 256 if ( $plugin['is_uninstallable'] ) { 257 257 /* translators: 1: plugin name, 2: plugin author */ 258 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>';258 echo '<li>', sprintf( __( '<strong>%1$s</strong> by <em>%2$s</em> (will also <strong>delete its data</strong>)' ), $plugin['Name'], $plugin['Author'] ), '</li>'; 259 259 $data_to_delete = true; 260 260 } else { 261 261 /* translators: 1: plugin name, 2: plugin author */ 262 echo '<li>', sprintf( __('<strong>%1$s</strong> by <em>%2$s</em>' ), esc_html($plugin['Name']), esc_html($plugin['Author'])), '</li>';262 echo '<li>', sprintf( __('<strong>%1$s</strong> by <em>%2$s</em>' ), $plugin['Name'], $plugin['Author'] ), '</li>'; 263 263 } 264 264 } … … 290 290 <?php 291 291 foreach ( (array)$files_to_delete as $file ) 292 echo '<li>' . esc_html(str_replace(WP_PLUGIN_DIR, '', $file)) . '</li>';292 echo '<li>' . str_replace(WP_PLUGIN_DIR, '', $file) . '</li>'; 293 293 ?> 294 294 </ul> -
branches/3.0/wp-includes/canonical.php
r16641 r15477 104 104 if ( $redirect_url = get_permalink(get_query_var('p')) ) 105 105 $redirect['query'] = remove_query_arg(array('p', 'post_type'), $redirect['query']); 106 if ( get_query_var( 'page' ) ) { 107 $redirect_url = trailingslashit( $redirect_url ) . user_trailingslashit( get_query_var( 'page' ), 'single_paged' ); 108 $redirect['query'] = remove_query_arg( 'page', $redirect['query'] ); 109 } 106 110 } elseif ( is_single() && !empty($_GET['name']) && ! $redirect_url ) { 107 111 if ( $redirect_url = get_permalink( $wp_query->get_queried_object_id() ) ) … … 177 181 } 178 182 } elseif ( is_single() && strpos($wp_rewrite->permalink_structure, '%category%') !== false ) { 179 $category = get_ category_by_path(get_query_var('category_name'));183 $category = get_term_by('slug', get_query_var('category_name'), 'category'); 180 184 $post_terms = wp_get_object_terms($wp_query->get_queried_object_id(), 'category', array('fields' => 'tt_ids')); 181 185 if ( (!$category || is_wp_error($category)) || ( !is_wp_error($post_terms) && !empty($post_terms) && !in_array($category->term_taxonomy_id, $post_terms) ) ) 182 186 $redirect_url = get_permalink($wp_query->get_queried_object_id()); 183 }184 185 // Post Paging186 if ( is_singular() && get_query_var('page') && $redirect_url ) {187 $redirect_url = trailingslashit( $redirect_url ) . user_trailingslashit( get_query_var( 'page' ), 'single_paged' );188 $redirect['query'] = remove_query_arg( 'page', $redirect['query'] );189 187 } 190 188 -
branches/3.0/wp-includes/capabilities.php
r16641 r15477 799 799 case 'remove_user': 800 800 $caps[] = 'remove_users'; 801 break; 802 case 'delete_user': 803 $caps[] = 'delete_users'; 801 804 break; 802 805 case 'promote_user': … … 810 813 case 'edit_users': 811 814 // If multisite these caps are allowed only for super admins. 812 if ( is_multisite() && !is_super_admin( $user_id) )815 if ( is_multisite() && !is_super_admin() ) 813 816 $caps[] = 'do_not_allow'; 814 817 else … … 989 992 break; 990 993 case 'unfiltered_upload': 991 if ( defined('ALLOW_UNFILTERED_UPLOADS') && ALLOW_UNFILTERED_UPLOADS && ( !is_multisite() || is_super_admin( $user_id) ) )994 if ( defined('ALLOW_UNFILTERED_UPLOADS') && ALLOW_UNFILTERED_UPLOADS && ( !is_multisite() || is_super_admin() ) ) 992 995 $caps[] = $cap; 993 996 else … … 1026 1029 case 'delete_users': 1027 1030 // If multisite these caps are allowed only for super admins. 1028 if ( is_multisite() && !is_super_admin( $user_id ) ) {1031 if ( is_multisite() && !is_super_admin() ) 1029 1032 $caps[] = 'do_not_allow'; 1030 } else { 1031 if ( 'delete_user' == $cap ) 1032 $cap = 'delete_users'; 1033 else 1033 1034 $caps[] = $cap; 1034 }1035 1035 break; 1036 1036 case 'create_users': … … 1080 1080 $current_user = wp_get_current_user(); 1081 1081 1082 if ( is_multisite() && is_super_admin() ) 1083 return true; 1084 1082 1085 if ( empty( $current_user ) ) 1083 1086 return false; -
branches/3.0/wp-includes/comment.php
r16641 r15477 19 19 * then the check fails. 20 20 * 21 * If the comment author was approved before, then the comment is 22 * automatically whitelisted. 21 * If the comment is a trackback and part of the blogroll, then the trackback is 22 * automatically whitelisted. If the comment author was approved before, then 23 * the comment is automatically whitelisted. 23 24 * 24 25 * If none of the checks fail, then the failback is to set the check to pass … … 80 81 // Comment whitelisting: 81 82 if ( 1 == get_option('comment_whitelist')) { 82 if ( 'trackback' != $comment_type && 'pingback' != $comment_type && $author != '' && $email != '' ) { 83 if ( 'trackback' == $comment_type || 'pingback' == $comment_type ) { // check if domain is in blogroll 84 $uri = parse_url($url); 85 $domain = $uri['host']; 86 $uri = parse_url( home_url() ); 87 $home_domain = $uri['host']; 88 if ( $wpdb->get_var($wpdb->prepare("SELECT link_id FROM $wpdb->links WHERE link_url LIKE (%s) LIMIT 1", '%'.$domain.'%')) || $domain == $home_domain ) 89 return true; 90 else 91 return false; 92 } elseif ( $author != '' && $email != '' ) { 83 93 // expected_slashed ($author, $email) 84 94 $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"); … … 1645 1655 $pinged[] = $tb_ping; 1646 1656 } else { 1647 $wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET to_ping = TRIM(REPLACE(to_ping, %s, '')) WHERE ID = %d", $tb_ping, $post_id) );1657 $wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET to_ping = TRIM(REPLACE(to_ping, '$tb_ping', '')) WHERE ID = %d", $post_id) ); 1648 1658 } 1649 1659 } -
branches/3.0/wp-includes/functions.php
r16641 r15477 2126 2126 $upload_path = get_option( 'upload_path' ); 2127 2127 $upload_path = trim($upload_path); 2128 $main_override = is_multisite() &&defined( 'MULTISITE' ) && is_main_site();2128 $main_override = defined( 'MULTISITE' ) && is_main_site(); 2129 2129 if ( empty($upload_path) ) { 2130 2130 $dir = WP_CONTENT_DIR . '/uploads'; -
branches/3.0/wp-includes/load.php
r16641 r15477 580 580 return MULTISITE; 581 581 582 if ( defined( ' SUBDOMAIN_INSTALL' ) || defined( 'VHOST' ) || defined( 'SUNRISE' ) )582 if ( defined( 'VHOST' ) || defined( 'SUNRISE' ) ) 583 583 return true; 584 584 -
branches/3.0/wp-includes/ms-files.php
r16641 r15477 30 30 } 31 31 32 $mime = wp_check_filetype( $ file);32 $mime = wp_check_filetype( $_SERVER[ 'REQUEST_URI' ] ); 33 33 if( false === $mime[ 'type' ] && function_exists( 'mime_content_type' ) ) 34 34 $mime[ 'type' ] = mime_content_type( $file ); … … 37 37 $mimetype = $mime[ 'type' ]; 38 38 else 39 $mimetype = 'image/' . substr( $ file, strrpos( $file, '.' ) + 1 );39 $mimetype = 'image/' . substr( $_SERVER[ 'REQUEST_URI' ], strrpos( $_SERVER[ 'REQUEST_URI' ], '.' ) + 1 ); 40 40 41 41 header( 'Content-type: ' . $mimetype ); // always send this -
branches/3.0/wp-includes/version.php
r16641 r15477 9 9 * @global string $wp_version 10 10 */ 11 $wp_version = '3.0. 2';11 $wp_version = '3.0.1'; 12 12 13 13 /** … … 16 16 * @global int $wp_db_version 17 17 */ 18 $wp_db_version = 15 477;18 $wp_db_version = 15260; 19 19 20 20 /**
Note: See TracChangeset
for help on using the changeset viewer.