Ticket #14546: 14546.diff
File 14546.diff, 8.5 KB (added by , 13 years ago) |
---|
-
wp-includes/taxonomy.php
291 291 * @param array|string $args See above description for the two keys values. 292 292 */ 293 293 function register_taxonomy( $taxonomy, $object_type, $args = array() ) { 294 global $wp_taxonomies, $wp _rewrite, $wp;294 global $wp_taxonomies, $wp; 295 295 296 296 if ( ! is_array($wp_taxonomies) ) 297 297 $wp_taxonomies = array(); … … 329 329 else 330 330 $tag = '([^/]+)'; 331 331 332 $wp_rewrite->add_rewrite_tag("%$taxonomy%", $tag, $args['query_var'] ? "{$args['query_var']}=" : "taxonomy=$taxonomy&term=");333 $wp_rewrite->add_permastruct($taxonomy, "{$args['rewrite']['slug']}/%$taxonomy%", $args['rewrite']['with_front']);332 add_rewrite_tag("%$taxonomy%", $tag, $args['query_var'] ? "{$args['query_var']}=" : "taxonomy=$taxonomy&term="); 333 add_permastruct($taxonomy, "{$args['rewrite']['slug']}/%$taxonomy%", $args['rewrite']['with_front']); 334 334 } 335 335 336 336 if ( is_null($args['show_ui']) ) -
wp-includes/link-template.php
589 589 * @return string Link to the feed for the term specified by $term_id and $taxonomy. 590 590 */ 591 591 function get_term_feed_link( $term_id, $taxonomy = 'category', $feed = '' ) { 592 global $wp_rewrite;593 594 592 $term_id = ( int ) $term_id; 595 593 596 594 $term = get_term( $term_id, $taxonomy ); -
wp-includes/category-template.php
612 612 * @return string 613 613 */ 614 614 function wp_generate_tag_cloud( $tags, $args = '' ) { 615 global $wp_rewrite;616 615 $defaults = array( 617 616 'smallest' => 8, 'largest' => 22, 'unit' => 'pt', 'number' => 0, 618 617 'format' => 'flat', 'separator' => "\n", 'orderby' => 'name', 'order' => 'ASC', -
wp-includes/post.php
1001 1001 $args->rewrite['feeds'] = (bool) $args->has_archive; 1002 1002 1003 1003 if ( $args->hierarchical ) 1004 $wp_rewrite->add_rewrite_tag("%$post_type%", '(.+?)', $args->query_var ? "{$args->query_var}=" : "post_type=$post_type&name=");1004 add_rewrite_tag("%$post_type%", '(.+?)', $args->query_var ? "{$args->query_var}=" : "post_type=$post_type&name="); 1005 1005 else 1006 $wp_rewrite->add_rewrite_tag("%$post_type%", '([^/]+)', $args->query_var ? "{$args->query_var}=" : "post_type=$post_type&name=");1006 add_rewrite_tag("%$post_type%", '([^/]+)', $args->query_var ? "{$args->query_var}=" : "post_type=$post_type&name="); 1007 1007 1008 1008 if ( $args->has_archive ) { 1009 1009 $archive_slug = $args->has_archive === true ? $args->rewrite['slug'] : $args->has_archive; … … 1012 1012 else 1013 1013 $archive_slug = $wp_rewrite->root . $archive_slug; 1014 1014 1015 $wp_rewrite->add_rule( "{$archive_slug}/?$", "index.php?post_type=$post_type", 'top' );1015 add_rewrite_rule( "{$archive_slug}/?$", "index.php?post_type=$post_type", 'top' ); 1016 1016 if ( $args->rewrite['feeds'] && $wp_rewrite->feeds ) { 1017 1017 $feeds = '(' . trim( implode( '|', $wp_rewrite->feeds ) ) . ')'; 1018 $wp_rewrite->add_rule( "{$archive_slug}/feed/$feeds/?$", "index.php?post_type=$post_type" . '&feed=$matches[1]', 'top' );1019 $wp_rewrite->add_rule( "{$archive_slug}/$feeds/?$", "index.php?post_type=$post_type" . '&feed=$matches[1]', 'top' );1018 add_rewrite_rule( "{$archive_slug}/feed/$feeds/?$", "index.php?post_type=$post_type" . '&feed=$matches[1]', 'top' ); 1019 add_rewrite_rule( "{$archive_slug}/$feeds/?$", "index.php?post_type=$post_type" . '&feed=$matches[1]', 'top' ); 1020 1020 } 1021 1021 if ( $args->rewrite['pages'] ) 1022 $wp_rewrite->add_rule( "{$archive_slug}/{$wp_rewrite->pagination_base}/([0-9]{1,})/?$", "index.php?post_type=$post_type" . '&paged=$matches[1]', 'top' );1022 add_rewrite_rule( "{$archive_slug}/{$wp_rewrite->pagination_base}/([0-9]{1,})/?$", "index.php?post_type=$post_type" . '&paged=$matches[1]', 'top' ); 1023 1023 } 1024 1024 1025 $wp_rewrite->add_permastruct($post_type, "{$args->rewrite['slug']}/%$post_type%", $args->rewrite['with_front'], $args->permalink_epmask);1025 add_permastruct($post_type, "{$args->rewrite['slug']}/%$post_type%", $args->rewrite['with_front'], $args->permalink_epmask); 1026 1026 } 1027 1027 1028 1028 if ( $args->register_meta_box_cb ) … … 1963 1963 * @return mixed False on failure 1964 1964 */ 1965 1965 function wp_delete_post( $postid = 0, $force_delete = false ) { 1966 global $wpdb , $wp_rewrite;1966 global $wpdb; 1967 1967 1968 1968 if ( !$post = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->posts WHERE ID = %d", $postid)) ) 1969 1969 return $post; … … 2401 2401 * 2402 2402 * @since 1.0.0 2403 2403 * @uses $wpdb 2404 * @uses $wp_rewrite2405 2404 * @uses $user_ID 2406 2405 * @uses do_action() Calls 'pre_post_update' on post ID if this is an update. 2407 2406 * @uses do_action() Calls 'edit_post' action on post ID and post data if this is an update. … … 2414 2413 * @return int|WP_Error The value 0 or WP_Error on failure. The post ID on success. 2415 2414 */ 2416 2415 function wp_insert_post($postarr, $wp_error = false) { 2417 global $wpdb, $ wp_rewrite, $user_ID;2416 global $wpdb, $user_ID; 2418 2417 2419 2418 $defaults = array('post_status' => 'draft', 'post_type' => 'post', 'post_author' => $user_ID, 2420 2419 'ping_status' => get_option('default_ping_status'), 'post_parent' => 0, -
wp-admin/includes/upgrade.php
35 35 * @return array Array keys 'url', 'user_id', 'password', 'password_message'. 36 36 */ 37 37 function wp_install( $blog_title, $user_name, $user_email, $public, $deprecated = '', $user_password = '' ) { 38 global $wp_rewrite;39 40 38 if ( !empty( $deprecated ) ) 41 39 _deprecated_argument( __FUNCTION__, '2.6' ); 42 40 … … 82 80 83 81 wp_install_defaults($user_id); 84 82 85 $wp_rewrite->flush_rules();83 flush_rewrite_rules(); 86 84 87 85 wp_new_blog_notification($blog_title, $guessurl, $user_id, ($email_password ? $user_password : __('The password you chose during the install.') ) ); 88 86 … … 391 389 * @since 1.0.1 392 390 */ 393 391 function upgrade_all() { 394 global $wp_current_db_version, $wp_db_version , $wp_rewrite;392 global $wp_current_db_version, $wp_db_version; 395 393 $wp_current_db_version = __get_option('db_version'); 396 394 397 395 // We are up-to-date. Nothing to do. -
wp-admin/includes/misc.php
200 200 * @param unknown_type $value 201 201 */ 202 202 function update_home_siteurl( $old_value, $value ) { 203 global $wp_rewrite;204 205 203 if ( defined( "WP_INSTALLING" ) ) 206 204 return; 207 205 208 206 // If home changed, write rewrite rules to new location. 209 $wp_rewrite->flush_rules();207 flush_rewrite_rules(); 210 208 } 211 209 212 210 add_action( 'update_option_home', 'update_home_siteurl', 10, 2 ); -
wp-admin/includes/schema.php
811 811 * so the error code must be checked) or failure. 812 812 */ 813 813 function populate_network( $network_id = 1, $domain = '', $email = '', $site_name = '', $path = '/', $subdomain_install = false ) { 814 global $wpdb, $current_site, $wp_db_version , $wp_rewrite;814 global $wpdb, $current_site, $wp_db_version; 815 815 816 816 $errors = new WP_Error(); 817 817 if ( '' == $domain ) … … 932 932 else 933 933 update_option( 'permalink_structure', '/blog/%year%/%monthnum%/%day%/%postname%/'); 934 934 935 $wp_rewrite->flush_rules();935 flush_rewrite_rules(); 936 936 937 937 if ( $subdomain_install ) { 938 938 $vhost_ok = false; -
wp-admin/options-permalink.php
140 140 else 141 141 $usingpi = false; 142 142 143 $wp_rewrite->flush_rules();143 flush_rewrite_rules(); 144 144 145 145 if (isset($_POST['submit'])) : ?> 146 146 <div id="message" class="updated"><p><?php -
wp-admin/admin.php
30 30 require_once(dirname(dirname(__FILE__)) . '/wp-load.php'); 31 31 32 32 if ( get_option('db_upgraded') ) { 33 $wp_rewrite->flush_rules();33 flush_rewrite_rules(); 34 34 update_option( 'db_upgraded', false ); 35 35 36 36 /**