Ticket #14546: refactor_for_wp_rewrite.diff
File refactor_for_wp_rewrite.diff, 10.2 KB (added by , 15 years ago) |
---|
-
wp-admin/admin.php
# This patch file was generated by NetBeans IDE # Following Index: paths are relative to: C:\Documents and Settings\John\My Documents\Programming\SVN Repository\wordpress.core # This patch can be applied using context Tools: Patch action on respective folder. # It uses platform neutral UTF-8 encoding and \n newlines. # Above lines and this line are ignored by the patching process.
23 23 require_once(dirname(dirname(__FILE__)) . '/wp-load.php'); 24 24 25 25 if ( get_option('db_upgraded') ) { 26 $wp_rewrite->flush_rules();26 flush_rewrite_rules(); 27 27 update_option( 'db_upgraded', false ); 28 28 29 29 /** … … 200 200 include(ABSPATH . 'wp-admin/admin-footer.php'); 201 201 202 202 // Make sure rules are flushed 203 global $wp_rewrite; 204 $wp_rewrite->flush_rules(false); 203 flush_rewrite_rules(false); 205 204 206 205 exit(); 207 206 } else { -
wp-admin/includes/misc.php
199 199 * @param unknown_type $value 200 200 */ 201 201 function update_home_siteurl( $old_value, $value ) { 202 global $wp_rewrite;203 202 204 203 if ( defined( "WP_INSTALLING" ) ) 205 204 return; 206 205 207 206 // If home changed, write rewrite rules to new location. 208 $wp_rewrite->flush_rules();207 flush_rewrite_rules(); 209 208 } 210 209 211 210 add_action( 'update_option_home', 'update_home_siteurl', 10, 2 ); -
wp-admin/includes/schema.php
630 630 * so the error code must be checked) or failure. 631 631 */ 632 632 function populate_network( $network_id = 1, $domain = '', $email = '', $site_name = '', $path = '/', $subdomain_install = false ) { 633 global $wpdb, $current_site, $wp_db_version , $wp_rewrite;633 global $wpdb, $current_site, $wp_db_version; 634 634 635 635 $errors = new WP_Error(); 636 636 if ( '' == $domain ) … … 750 750 else 751 751 update_option( 'permalink_structure', '/blog/%year%/%monthnum%/%day%/%postname%/'); 752 752 753 $wp_rewrite->flush_rules();753 flush_rewrite_rules(); 754 754 755 755 if ( $subdomain_install ) { 756 756 $vhost_ok = false; -
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 38 40 39 if ( !empty( $deprecated ) ) 41 40 _deprecated_argument( __FUNCTION__, '2.6' ); … … 82 81 83 82 wp_install_defaults($user_id); 84 83 85 $wp_rewrite->flush_rules();84 flush_rewrite_rules(); 86 85 87 86 wp_new_blog_notification($blog_title, $guessurl, $user_id, ($email_password ? $user_password : __('The password you chose during the install.') ) ); 88 87 … … 103 102 * @param int $user_id User ID. 104 103 */ 105 104 function wp_install_defaults($user_id) { 106 global $wpdb, $ wp_rewrite, $current_site, $table_prefix;105 global $wpdb, $current_site, $table_prefix; 107 106 108 107 // Default category 109 108 $cat_name = __('Uncategorized'); … … 277 276 278 277 if ( is_multisite() ) { 279 278 // Flush rules to pick up the new page. 279 global $wp_rewrite; 280 280 $wp_rewrite->init(); 281 $wp_rewrite->flush_rules();281 flush_rewrite_rules(); 282 282 283 283 $user = new WP_User($user_id); 284 284 $wpdb->update( $wpdb->options, array('option_value' => $user->user_email), array('option_name' => 'admin_email') ); … … 378 378 * @since unknown 379 379 */ 380 380 function upgrade_all() { 381 global $wp_current_db_version, $wp_db_version , $wp_rewrite;381 global $wp_current_db_version, $wp_db_version; 382 382 $wp_current_db_version = __get_option('db_version'); 383 383 384 384 // We are up-to-date. Nothing to do. -
wp-admin/options-permalink.php
120 120 else 121 121 $usingpi = false; 122 122 123 $wp_rewrite->flush_rules();123 flush_rewrite_rules(); 124 124 125 125 126 126 if (isset($_POST['submit'])) : ?> -
wp-includes/category-template.php
645 645 * @return string 646 646 */ 647 647 function wp_generate_tag_cloud( $tags, $args = '' ) { 648 global $wp_rewrite;649 No newline at end of file650 648 $defaults = array( 651 649 'smallest' => 8, 'largest' => 22, 'unit' => 'pt', 'number' => 0, 652 650 'format' => 'flat', 'separator' => "\n", 'orderby' => 'name', 'order' => 'ASC', -
wp-includes/link-template.php
585 585 * @return string Link to the feed for the taxonomy specified by $term_id and $taxonomy. 586 586 */ 587 587 function get_term_feed_link( $term_id, $taxonomy = 'category', $feed = '' ) { 588 global $wp_rewrite;589 588 590 589 $term_id = ( int ) $term_id; 591 590 -
wp-includes/post.php
803 803 * @return object the registered post type object 804 804 */ 805 805 function register_post_type($post_type, $args = array()) { 806 global $wp_post_types, $wp _rewrite, $wp;806 global $wp_post_types, $wp; 807 807 808 808 if ( !is_array($wp_post_types) ) 809 809 $wp_post_types = array(); … … 867 867 if ( !isset($args->rewrite['with_front']) ) 868 868 $args->rewrite['with_front'] = true; 869 869 if ( $args->hierarchical ) 870 $wp_rewrite->add_rewrite_tag("%$post_type%", '(.+?)', $args->query_var ? "{$args->query_var}=" : "post_type=$post_type&name=");870 add_rewrite_tag("%$post_type%", '(.+?)', $args->query_var ? "{$args->query_var}=" : "post_type=$post_type&name="); 871 871 else 872 $wp_rewrite->add_rewrite_tag("%$post_type%", '([^/]+)', $args->query_var ? "{$args->query_var}=" : "post_type=$post_type&name=");873 $wp_rewrite->add_permastruct($post_type, "{$args->rewrite['slug']}/%$post_type%", $args->rewrite['with_front'], $args->permalink_epmask);872 add_rewrite_tag("%$post_type%", '([^/]+)', $args->query_var ? "{$args->query_var}=" : "post_type=$post_type&name="); 873 add_permastruct($post_type, "{$args->rewrite['slug']}/%$post_type%", $args->rewrite['with_front'], $args->permalink_epmask); 874 874 } 875 875 876 876 if ( $args->register_meta_box_cb ) … … 1714 1714 * @return mixed False on failure 1715 1715 */ 1716 1716 function wp_delete_post( $postid = 0, $force_delete = false ) { 1717 global $wpdb , $wp_rewrite;1717 global $wpdb; 1718 1718 1719 1719 if ( !$post = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->posts WHERE ID = %d", $postid)) ) 1720 1720 return $post; … … 1790 1790 foreach ( (array) $children as $child ) 1791 1791 clean_page_cache($child->ID); 1792 1792 1793 $wp_rewrite->flush_rules(false);1793 flush_rewrite_rules(false); 1794 1794 } else { 1795 1795 clean_post_cache($postid); 1796 1796 } … … 2130 2130 * @since 1.0.0 2131 2131 * @link http://core.trac.wordpress.org/ticket/9084 Bug report on 'wp_insert_post_data' filter. 2132 2132 * @uses $wpdb 2133 * @uses $wp_rewrite2134 2133 * @uses $user_ID 2135 2134 * 2136 2135 * @uses do_action() Calls 'pre_post_update' on post ID if this is an update. … … 2147 2146 * @return int|WP_Error The value 0 or WP_Error on failure. The post ID on success. 2148 2147 */ 2149 2148 function wp_insert_post($postarr = array(), $wp_error = false) { 2150 global $wpdb, $ wp_rewrite, $user_ID;2149 global $wpdb, $user_ID; 2151 2150 2152 2151 $defaults = array('post_status' => 'draft', 'post_type' => 'post', 'post_author' => $user_ID, 2153 2152 'ping_status' => get_option('default_ping_status'), 'post_parent' => 0, … … 4272 4271 * 4273 4272 * @since 2.3.0 4274 4273 * @access private 4275 * @uses $wp_rewriteFlushes Rewrite Rules.4274 * @uses flush_rewrite_rules() Flushes Rewrite Rules. 4276 4275 * 4277 4276 * @param int $post_id The ID in the database table for the $post 4278 4277 * @param object $post Object type containing the post information … … 4282 4281 clean_page_cache($post_id); 4283 4282 // Avoid flushing rules for every post during import. 4284 4283 if ( !defined('WP_IMPORTING') ) { 4285 global $wp_rewrite; 4286 $wp_rewrite->flush_rules(false); 4284 flush_rewrite_rules(false); 4287 4285 } 4288 4286 } else { 4289 4287 clean_post_cache($post_id); -
wp-includes/taxonomy.php
247 247 * @subpackage Taxonomy 248 248 * @since 2.3.0 249 249 * @uses $wp_taxonomies Inserts new taxonomy object into the list 250 * @uses $wp_rewrite Adds rewrite tags and permastructs251 250 * @uses $wp Adds query vars 252 251 * 253 252 * @param string $taxonomy Name of taxonomy object … … 255 254 * @param array|string $args See above description for the two keys values. 256 255 */ 257 256 function register_taxonomy( $taxonomy, $object_type, $args = array() ) { 258 global $wp_taxonomies, $wp _rewrite, $wp;257 global $wp_taxonomies, $wp; 259 258 260 259 if ( ! is_array($wp_taxonomies) ) 261 260 $wp_taxonomies = array(); … … 286 285 'slug' => sanitize_title_with_dashes($taxonomy), 287 286 'with_front' => true, 288 287 )); 289 $wp_rewrite->add_rewrite_tag("%$taxonomy%", '([^/]+)', $args['query_var'] ? "{$args['query_var']}=" : "taxonomy=$taxonomy&term=");290 $wp_rewrite->add_permastruct($taxonomy, "{$args['rewrite']['slug']}/%$taxonomy%", $args['rewrite']['with_front']);288 add_rewrite_tag("%$taxonomy%", '([^/]+)', $args['query_var'] ? "{$args['query_var']}=" : "taxonomy=$taxonomy&term="); 289 add_permastruct($taxonomy, "{$args['rewrite']['slug']}/%$taxonomy%", $args['rewrite']['with_front']); 291 290 } 292 291 293 292 if ( is_null($args['show_ui']) ) -
wp-includes/theme.php
1077 1077 * @param bool $require_once Whether to require_once or require. Default true. 1078 1078 */ 1079 1079 function load_template( $_template_file, $require_once = true ) { 1080 global $posts, $post, $wp_did_header, $wp_did_template_redirect, $wp_query, $wp _rewrite, $wpdb, $wp_version, $wp, $id, $comment, $user_ID;1080 global $posts, $post, $wp_did_header, $wp_did_template_redirect, $wp_query, $wpdb, $wp_version, $wp, $id, $comment, $user_ID; 1081 1081 1082 1082 if ( is_array( $wp_query->query_vars ) ) 1083 1083 extract( $wp_query->query_vars, EXTR_SKIP );