Changeset 20023 for trunk/wp-includes/post.php

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.

File:

• trunk/wp-includes/post.php (modified) (5 diffs)

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,