Changeset 20023

Timestamp:

02/28/2012 08:29:33 PM (13 years ago)

Author:

duck_

Message:

Reduce references to the $wp_rewrite global because it's no longer used or a wrapper function can be used instead. Fixes #14546.#14546.

Location:

trunk

Files:

• wp-admin/admin.php (modified) (1 diff)
• wp-admin/includes/misc.php (modified) (1 diff)
• wp-admin/includes/schema.php (modified) (2 diffs)
• wp-admin/includes/upgrade.php (modified) (3 diffs)
• wp-admin/options-permalink.php (modified) (1 diff)
• wp-includes/category-template.php (modified) (1 diff)
• wp-includes/link-template.php (modified) (1 diff)
• wp-includes/post.php (modified) (5 diffs)
• wp-includes/taxonomy.php (modified) (3 diffs)

trunk/wp-admin/admin.php

@@ -31 +31 @@
 
 if ( get_option('db_upgraded') ) {
-    $wp_rewrite->flush_rules();
+    flush_rewrite_rules();
     update_option( 'db_upgraded',  false );
 

trunk/wp-admin/includes/misc.php

@@ -197 +197 @@
  * @since 2.1.0
  *
- * @param unknown_type $old_value
- * @param unknown_type $value
+ * @param string $old_value
+ * @param string $value
  */
 function update_home_siteurl( $old_value, $value ) {
-    global $wp_rewrite;
-
     if ( defined( "WP_INSTALLING" ) )
         return;
 
     // If home changed, write rewrite rules to new location.
-    $wp_rewrite->flush_rules();
+    flush_rewrite_rules();
 }
 

trunk/wp-admin/includes/schema.php

@@ -822 +822 @@
  */
 function populate_network( $network_id = 1, $domain = '', $email = '', $site_name = '', $path = '/', $subdomain_install = false ) {
-    global $wpdb, $current_site, $wp_db_version, $wp_rewrite;
+    global $wpdb, $current_site, $wp_db_version;
 
     $errors = new WP_Error();
@@ -943 +943 @@
         update_option( 'permalink_structure', '/blog/%year%/%monthnum%/%day%/%postname%/');
 
-    $wp_rewrite->flush_rules();
+    flush_rewrite_rules();
 
     if ( $subdomain_install ) {

trunk/wp-admin/includes/upgrade.php

@@ -36 +36 @@
  */
 function wp_install( $blog_title, $user_name, $user_email, $public, $deprecated = '', $user_password = '' ) {
-    global $wp_rewrite;
-
     if ( !empty( $deprecated ) )
         _deprecated_argument( __FUNCTION__, '2.6' );
@@ -83 +81 @@
     wp_install_defaults($user_id);
 
-    $wp_rewrite->flush_rules();
+    flush_rewrite_rules();
 
     wp_new_blog_notification($blog_title, $guessurl, $user_id, ($email_password ? $user_password : __('The password you chose during the install.') ) );
@@ -392 +390 @@
  */
 function upgrade_all() {
-    global $wp_current_db_version, $wp_db_version, $wp_rewrite;
+    global $wp_current_db_version, $wp_db_version;
     $wp_current_db_version = __get_option('db_version');
 

trunk/wp-admin/options-permalink.php

@@ -141 +141 @@
     $usingpi = false;
 
-$wp_rewrite->flush_rules();
+flush_rewrite_rules();
 
 if (isset($_POST['submit'])) : ?>

trunk/wp-includes/category-template.php

@@ -606 +606 @@
  */
 function wp_generate_tag_cloud( $tags, $args = '' ) {
-    global $wp_rewrite;
     $defaults = array(
         'smallest' => 8, 'largest' => 22, 'unit' => 'pt', 'number' => 0,

trunk/wp-includes/link-template.php

@@ -590 +590 @@
 */
 function get_term_feed_link( $term_id, $taxonomy = 'category', $feed = '' ) {
-    global $wp_rewrite;
-
     $term_id = ( int ) $term_id;
 

trunk/wp-includes/post.php

@@ -1007 +1007 @@
 
         if ( $args->hierarchical )
-            $wp_rewrite->add_rewrite_tag("%$post_type%", '(.+?)', $args->query_var ? "{$args->query_var}=" : "post_type=$post_type&name=");
+            add_rewrite_tag("%$post_type%", '(.+?)', $args->query_var ? "{$args->query_var}=" : "post_type=$post_type&name=");
         else
-            $wp_rewrite->add_rewrite_tag("%$post_type%", '([^/]+)', $args->query_var ? "{$args->query_var}=" : "post_type=$post_type&name=");
+            add_rewrite_tag("%$post_type%", '([^/]+)', $args->query_var ? "{$args->query_var}=" : "post_type=$post_type&name=");
 
         if ( $args->has_archive ) {
@@ -1018 +1018 @@
                 $archive_slug = $wp_rewrite->root . $archive_slug;
 
-            $wp_rewrite->add_rule( "{$archive_slug}/?$", "index.php?post_type=$post_type", 'top' );
+            add_rewrite_rule( "{$archive_slug}/?$", "index.php?post_type=$post_type", 'top' );
             if ( $args->rewrite['feeds'] && $wp_rewrite->feeds ) {
                 $feeds = '(' . trim( implode( '|', $wp_rewrite->feeds ) ) . ')';
-                $wp_rewrite->add_rule( "{$archive_slug}/feed/$feeds/?$", "index.php?post_type=$post_type" . '&feed=$matches[1]', 'top' );
-                $wp_rewrite->add_rule( "{$archive_slug}/$feeds/?$", "index.php?post_type=$post_type" . '&feed=$matches[1]', 'top' );
+                add_rewrite_rule( "{$archive_slug}/feed/$feeds/?$", "index.php?post_type=$post_type" . '&feed=$matches[1]', 'top' );
+                add_rewrite_rule( "{$archive_slug}/$feeds/?$", "index.php?post_type=$post_type" . '&feed=$matches[1]', 'top' );
             }
             if ( $args->rewrite['pages'] )
-                $wp_rewrite->add_rule( "{$archive_slug}/{$wp_rewrite->pagination_base}/([0-9]{1,})/?$", "index.php?post_type=$post_type" . '&paged=$matches[1]', 'top' );
+                add_rewrite_rule( "{$archive_slug}/{$wp_rewrite->pagination_base}/([0-9]{1,})/?$", "index.php?post_type=$post_type" . '&paged=$matches[1]', 'top' );
         }
 
-        $wp_rewrite->add_permastruct( $post_type, "{$args->rewrite['slug']}/%$post_type%", $args->rewrite );
+        add_permastruct( $post_type, "{$args->rewrite['slug']}/%$post_type%", $args->rewrite );
     }
 
@@ -1962 +1962 @@
  */
 function wp_delete_post( $postid = 0, $force_delete = false ) {
-    global $wpdb, $wp_rewrite;
+    global $wpdb;
 
     if ( !$post = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->posts WHERE ID = %d", $postid)) )
@@ -2400 +2400 @@
  * @since 1.0.0
  * @uses $wpdb
- * @uses $wp_rewrite
  * @uses $user_ID
  * @uses do_action() Calls 'pre_post_update' on post ID if this is an update.
@@ -2413 +2412 @@
  */
 function wp_insert_post($postarr, $wp_error = false) {
-    global $wpdb, $wp_rewrite, $user_ID;
+    global $wpdb, $user_ID;
 
     $defaults = array('post_status' => 'draft', 'post_type' => 'post', 'post_author' => $user_ID,

trunk/wp-includes/taxonomy.php

@@ -297 +297 @@
  * @since 2.3.0
  * @uses $wp_taxonomies Inserts new taxonomy object into the list
- * @uses $wp_rewrite Adds rewrite tags and permastructs
  * @uses $wp Adds query vars
  *
@@ -305 +304 @@
  */
 function register_taxonomy( $taxonomy, $object_type, $args = array() ) {
-    global $wp_taxonomies, $wp_rewrite, $wp;
+    global $wp_taxonomies, $wp;
 
     if ( ! is_array($wp_taxonomies) )
@@ -344 +343 @@
             $tag = '([^/]+)';
 
-        $wp_rewrite->add_rewrite_tag("%$taxonomy%", $tag, $args['query_var'] ? "{$args['query_var']}=" : "taxonomy=$taxonomy&term=");
-        $wp_rewrite->add_permastruct( $taxonomy, "{$args['rewrite']['slug']}/%$taxonomy%", $args['rewrite'] );
+        add_rewrite_tag( "%$taxonomy%", $tag, $args['query_var'] ? "{$args['query_var']}=" : "taxonomy=$taxonomy&term=" );
+        add_permastruct( $taxonomy, "{$args['rewrite']['slug']}/%$taxonomy%", $args['rewrite'] );
     }