<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[20023] trunk: Reduce references to the $wp_rewrite global because it's no longer used or a wrapper function can be used instead.</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/20023">20023</a></dd>
<dt>Author</dt> <dd>duck_</dd>
<dt>Date</dt> <dd>2012-02-28 20:29:33 +0000 (Tue, 28 Feb 2012)</dd>
</dl>

<h3>Log Message</h3>
<pre>Reduce references to the $wp_rewrite global because it's no longer used or a wrapper function can be used instead. Fixes <a href="http://core.trac.wordpress.org/ticket/14546">#14546</a>.<a href="http://core.trac.wordpress.org/ticket/14546">#14546</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminphp">trunk/wp-admin/admin.php</a></li>
<li><a href="#trunkwpadminincludesmiscphp">trunk/wp-admin/includes/misc.php</a></li>
<li><a href="#trunkwpadminincludesschemaphp">trunk/wp-admin/includes/schema.php</a></li>
<li><a href="#trunkwpadminincludesupgradephp">trunk/wp-admin/includes/upgrade.php</a></li>
<li><a href="#trunkwpadminoptionspermalinkphp">trunk/wp-admin/options-permalink.php</a></li>
<li><a href="#trunkwpincludescategorytemplatephp">trunk/wp-includes/category-template.php</a></li>
<li><a href="#trunkwpincludeslinktemplatephp">trunk/wp-includes/link-template.php</a></li>
<li><a href="#trunkwpincludespostphp">trunk/wp-includes/post.php</a></li>
<li><a href="#trunkwpincludestaxonomyphp">trunk/wp-includes/taxonomy.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminadminphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin.php (20022 => 20023)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin.php        2012-02-28 20:13:21 UTC (rev 20022)
+++ trunk/wp-admin/admin.php        2012-02-28 20:29:33 UTC (rev 20023)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> require_once(dirname(dirname(__FILE__)) . '/wp-load.php');
</span><span class="cx"> 
</span><span class="cx"> if ( get_option('db_upgraded') ) {
</span><del>-        $wp_rewrite-&gt;flush_rules();
</del><ins>+        flush_rewrite_rules();
</ins><span class="cx">         update_option( 'db_upgraded',  false );
</span><span class="cx"> 
</span><span class="cx">         /**
</span></span></pre></div>
<a id="trunkwpadminincludesmiscphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/misc.php (20022 => 20023)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/misc.php        2012-02-28 20:13:21 UTC (rev 20022)
+++ trunk/wp-admin/includes/misc.php        2012-02-28 20:29:33 UTC (rev 20023)
</span><span class="lines">@@ -196,17 +196,15 @@
</span><span class="cx">  *
</span><span class="cx">  * @since 2.1.0
</span><span class="cx">  *
</span><del>- * @param unknown_type $old_value
- * @param unknown_type $value
</del><ins>+ * @param string $old_value
+ * @param string $value
</ins><span class="cx">  */
</span><span class="cx"> function update_home_siteurl( $old_value, $value ) {
</span><del>-        global $wp_rewrite;
-
</del><span class="cx">         if ( defined( &quot;WP_INSTALLING&quot; ) )
</span><span class="cx">                 return;
</span><span class="cx"> 
</span><span class="cx">         // If home changed, write rewrite rules to new location.
</span><del>-        $wp_rewrite-&gt;flush_rules();
</del><ins>+        flush_rewrite_rules();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> add_action( 'update_option_home', 'update_home_siteurl', 10, 2 );
</span></span></pre></div>
<a id="trunkwpadminincludesschemaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/schema.php (20022 => 20023)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/schema.php        2012-02-28 20:13:21 UTC (rev 20022)
+++ trunk/wp-admin/includes/schema.php        2012-02-28 20:29:33 UTC (rev 20023)
</span><span class="lines">@@ -821,7 +821,7 @@
</span><span class="cx">  *         so the error code must be checked) or failure.
</span><span class="cx">  */
</span><span class="cx"> function populate_network( $network_id = 1, $domain = '', $email = '', $site_name = '', $path = '/', $subdomain_install = false ) {
</span><del>-        global $wpdb, $current_site, $wp_db_version, $wp_rewrite;
</del><ins>+        global $wpdb, $current_site, $wp_db_version;
</ins><span class="cx"> 
</span><span class="cx">         $errors = new WP_Error();
</span><span class="cx">         if ( '' == $domain )
</span><span class="lines">@@ -942,7 +942,7 @@
</span><span class="cx">         else
</span><span class="cx">                 update_option( 'permalink_structure', '/blog/%year%/%monthnum%/%day%/%postname%/');
</span><span class="cx"> 
</span><del>-        $wp_rewrite-&gt;flush_rules();
</del><ins>+        flush_rewrite_rules();
</ins><span class="cx"> 
</span><span class="cx">         if ( $subdomain_install ) {
</span><span class="cx">                 $vhost_ok = false;
</span></span></pre></div>
<a id="trunkwpadminincludesupgradephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/upgrade.php (20022 => 20023)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/upgrade.php        2012-02-28 20:13:21 UTC (rev 20022)
+++ trunk/wp-admin/includes/upgrade.php        2012-02-28 20:29:33 UTC (rev 20023)
</span><span class="lines">@@ -35,8 +35,6 @@
</span><span class="cx">  * @return array Array keys 'url', 'user_id', 'password', 'password_message'.
</span><span class="cx">  */
</span><span class="cx"> function wp_install( $blog_title, $user_name, $user_email, $public, $deprecated = '', $user_password = '' ) {
</span><del>-        global $wp_rewrite;
-
</del><span class="cx">         if ( !empty( $deprecated ) )
</span><span class="cx">                 _deprecated_argument( __FUNCTION__, '2.6' );
</span><span class="cx"> 
</span><span class="lines">@@ -82,7 +80,7 @@
</span><span class="cx"> 
</span><span class="cx">         wp_install_defaults($user_id);
</span><span class="cx"> 
</span><del>-        $wp_rewrite-&gt;flush_rules();
</del><ins>+        flush_rewrite_rules();
</ins><span class="cx"> 
</span><span class="cx">         wp_new_blog_notification($blog_title, $guessurl, $user_id, ($email_password ? $user_password : __('The password you chose during the install.') ) );
</span><span class="cx"> 
</span><span class="lines">@@ -391,7 +389,7 @@
</span><span class="cx">  * @since 1.0.1
</span><span class="cx">  */
</span><span class="cx"> function upgrade_all() {
</span><del>-        global $wp_current_db_version, $wp_db_version, $wp_rewrite;
</del><ins>+        global $wp_current_db_version, $wp_db_version;
</ins><span class="cx">         $wp_current_db_version = __get_option('db_version');
</span><span class="cx"> 
</span><span class="cx">         // We are up-to-date. Nothing to do.
</span></span></pre></div>
<a id="trunkwpadminoptionspermalinkphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-permalink.php (20022 => 20023)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-permalink.php        2012-02-28 20:13:21 UTC (rev 20022)
+++ trunk/wp-admin/options-permalink.php        2012-02-28 20:29:33 UTC (rev 20023)
</span><span class="lines">@@ -140,7 +140,7 @@
</span><span class="cx"> else
</span><span class="cx">         $usingpi = false;
</span><span class="cx"> 
</span><del>-$wp_rewrite-&gt;flush_rules();
</del><ins>+flush_rewrite_rules();
</ins><span class="cx"> 
</span><span class="cx"> if (isset($_POST['submit'])) : ?&gt;
</span><span class="cx"> &lt;div id=&quot;message&quot; class=&quot;updated&quot;&gt;&lt;p&gt;&lt;?php
</span></span></pre></div>
<a id="trunkwpincludescategorytemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/category-template.php (20022 => 20023)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/category-template.php        2012-02-28 20:13:21 UTC (rev 20022)
+++ trunk/wp-includes/category-template.php        2012-02-28 20:29:33 UTC (rev 20023)
</span><span class="lines">@@ -605,7 +605,6 @@
</span><span class="cx">  * @return string
</span><span class="cx">  */
</span><span class="cx"> function wp_generate_tag_cloud( $tags, $args = '' ) {
</span><del>-        global $wp_rewrite;
</del><span class="cx">         $defaults = array(
</span><span class="cx">                 'smallest' =&gt; 8, 'largest' =&gt; 22, 'unit' =&gt; 'pt', 'number' =&gt; 0,
</span><span class="cx">                 'format' =&gt; 'flat', 'separator' =&gt; &quot;\n&quot;, 'orderby' =&gt; 'name', 'order' =&gt; 'ASC',
</span></span></pre></div>
<a id="trunkwpincludeslinktemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/link-template.php (20022 => 20023)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/link-template.php        2012-02-28 20:13:21 UTC (rev 20022)
+++ trunk/wp-includes/link-template.php        2012-02-28 20:29:33 UTC (rev 20023)
</span><span class="lines">@@ -589,8 +589,6 @@
</span><span class="cx">  * @return string Link to the feed for the term specified by $term_id and $taxonomy.
</span><span class="cx"> */
</span><span class="cx"> function get_term_feed_link( $term_id, $taxonomy = 'category', $feed = '' ) {
</span><del>-        global $wp_rewrite;
-
</del><span class="cx">         $term_id = ( int ) $term_id;
</span><span class="cx"> 
</span><span class="cx">         $term = get_term( $term_id, $taxonomy  );
</span></span></pre></div>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (20022 => 20023)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php        2012-02-28 20:13:21 UTC (rev 20022)
+++ trunk/wp-includes/post.php        2012-02-28 20:29:33 UTC (rev 20023)
</span><span class="lines">@@ -1006,9 +1006,9 @@
</span><span class="cx">                 }
</span><span class="cx"> 
</span><span class="cx">                 if ( $args-&gt;hierarchical )
</span><del>-                        $wp_rewrite-&gt;add_rewrite_tag(&quot;%$post_type%&quot;, '(.+?)', $args-&gt;query_var ? &quot;{$args-&gt;query_var}=&quot; : &quot;post_type=$post_type&amp;name=&quot;);
</del><ins>+                        add_rewrite_tag(&quot;%$post_type%&quot;, '(.+?)', $args-&gt;query_var ? &quot;{$args-&gt;query_var}=&quot; : &quot;post_type=$post_type&amp;name=&quot;);
</ins><span class="cx">                 else
</span><del>-                        $wp_rewrite-&gt;add_rewrite_tag(&quot;%$post_type%&quot;, '([^/]+)', $args-&gt;query_var ? &quot;{$args-&gt;query_var}=&quot; : &quot;post_type=$post_type&amp;name=&quot;);
</del><ins>+                        add_rewrite_tag(&quot;%$post_type%&quot;, '([^/]+)', $args-&gt;query_var ? &quot;{$args-&gt;query_var}=&quot; : &quot;post_type=$post_type&amp;name=&quot;);
</ins><span class="cx"> 
</span><span class="cx">                 if ( $args-&gt;has_archive ) {
</span><span class="cx">                         $archive_slug = $args-&gt;has_archive === true ? $args-&gt;rewrite['slug'] : $args-&gt;has_archive;
</span><span class="lines">@@ -1017,17 +1017,17 @@
</span><span class="cx">                         else
</span><span class="cx">                                 $archive_slug = $wp_rewrite-&gt;root . $archive_slug;
</span><span class="cx"> 
</span><del>-                        $wp_rewrite-&gt;add_rule( &quot;{$archive_slug}/?$&quot;, &quot;index.php?post_type=$post_type&quot;, 'top' );
</del><ins>+                        add_rewrite_rule( &quot;{$archive_slug}/?$&quot;, &quot;index.php?post_type=$post_type&quot;, 'top' );
</ins><span class="cx">                         if ( $args-&gt;rewrite['feeds'] &amp;&amp; $wp_rewrite-&gt;feeds ) {
</span><span class="cx">                                 $feeds = '(' . trim( implode( '|', $wp_rewrite-&gt;feeds ) ) . ')';
</span><del>-                                $wp_rewrite-&gt;add_rule( &quot;{$archive_slug}/feed/$feeds/?$&quot;, &quot;index.php?post_type=$post_type&quot; . '&amp;feed=$matches[1]', 'top' );
-                                $wp_rewrite-&gt;add_rule( &quot;{$archive_slug}/$feeds/?$&quot;, &quot;index.php?post_type=$post_type&quot; . '&amp;feed=$matches[1]', 'top' );
</del><ins>+                                add_rewrite_rule( &quot;{$archive_slug}/feed/$feeds/?$&quot;, &quot;index.php?post_type=$post_type&quot; . '&amp;feed=$matches[1]', 'top' );
+                                add_rewrite_rule( &quot;{$archive_slug}/$feeds/?$&quot;, &quot;index.php?post_type=$post_type&quot; . '&amp;feed=$matches[1]', 'top' );
</ins><span class="cx">                         }
</span><span class="cx">                         if ( $args-&gt;rewrite['pages'] )
</span><del>-                                $wp_rewrite-&gt;add_rule( &quot;{$archive_slug}/{$wp_rewrite-&gt;pagination_base}/([0-9]{1,})/?$&quot;, &quot;index.php?post_type=$post_type&quot; . '&amp;paged=$matches[1]', 'top' );
</del><ins>+                                add_rewrite_rule( &quot;{$archive_slug}/{$wp_rewrite-&gt;pagination_base}/([0-9]{1,})/?$&quot;, &quot;index.php?post_type=$post_type&quot; . '&amp;paged=$matches[1]', 'top' );
</ins><span class="cx">                 }
</span><span class="cx"> 
</span><del>-                $wp_rewrite-&gt;add_permastruct( $post_type, &quot;{$args-&gt;rewrite['slug']}/%$post_type%&quot;, $args-&gt;rewrite );
</del><ins>+                add_permastruct( $post_type, &quot;{$args-&gt;rewrite['slug']}/%$post_type%&quot;, $args-&gt;rewrite );
</ins><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         if ( $args-&gt;register_meta_box_cb )
</span><span class="lines">@@ -1961,7 +1961,7 @@
</span><span class="cx">  * @return mixed False on failure
</span><span class="cx">  */
</span><span class="cx"> function wp_delete_post( $postid = 0, $force_delete = false ) {
</span><del>-        global $wpdb, $wp_rewrite;
</del><ins>+        global $wpdb;
</ins><span class="cx"> 
</span><span class="cx">         if ( !$post = $wpdb-&gt;get_row($wpdb-&gt;prepare(&quot;SELECT * FROM $wpdb-&gt;posts WHERE ID = %d&quot;, $postid)) )
</span><span class="cx">                 return $post;
</span><span class="lines">@@ -2399,7 +2399,6 @@
</span><span class="cx">  *
</span><span class="cx">  * @since 1.0.0
</span><span class="cx">  * @uses $wpdb
</span><del>- * @uses $wp_rewrite
</del><span class="cx">  * @uses $user_ID
</span><span class="cx">  * @uses do_action() Calls 'pre_post_update' on post ID if this is an update.
</span><span class="cx">  * @uses do_action() Calls 'edit_post' action on post ID and post data if this is an update.
</span><span class="lines">@@ -2412,7 +2411,7 @@
</span><span class="cx">  * @return int|WP_Error The value 0 or WP_Error on failure. The post ID on success.
</span><span class="cx">  */
</span><span class="cx"> function wp_insert_post($postarr, $wp_error = false) {
</span><del>-        global $wpdb, $wp_rewrite, $user_ID;
</del><ins>+        global $wpdb, $user_ID;
</ins><span class="cx"> 
</span><span class="cx">         $defaults = array('post_status' =&gt; 'draft', 'post_type' =&gt; 'post', 'post_author' =&gt; $user_ID,
</span><span class="cx">                 'ping_status' =&gt; get_option('default_ping_status'), 'post_parent' =&gt; 0,
</span></span></pre></div>
<a id="trunkwpincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/taxonomy.php (20022 => 20023)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/taxonomy.php        2012-02-28 20:13:21 UTC (rev 20022)
+++ trunk/wp-includes/taxonomy.php        2012-02-28 20:29:33 UTC (rev 20023)
</span><span class="lines">@@ -296,7 +296,6 @@
</span><span class="cx">  * @subpackage Taxonomy
</span><span class="cx">  * @since 2.3.0
</span><span class="cx">  * @uses $wp_taxonomies Inserts new taxonomy object into the list
</span><del>- * @uses $wp_rewrite Adds rewrite tags and permastructs
</del><span class="cx">  * @uses $wp Adds query vars
</span><span class="cx">  *
</span><span class="cx">  * @param string $taxonomy Name of taxonomy object
</span><span class="lines">@@ -304,7 +303,7 @@
</span><span class="cx">  * @param array|string $args See above description for the two keys values.
</span><span class="cx">  */
</span><span class="cx"> function register_taxonomy( $taxonomy, $object_type, $args = array() ) {
</span><del>-        global $wp_taxonomies, $wp_rewrite, $wp;
</del><ins>+        global $wp_taxonomies, $wp;
</ins><span class="cx"> 
</span><span class="cx">         if ( ! is_array($wp_taxonomies) )
</span><span class="cx">                 $wp_taxonomies = array();
</span><span class="lines">@@ -343,8 +342,8 @@
</span><span class="cx">                 else
</span><span class="cx">                         $tag = '([^/]+)';
</span><span class="cx"> 
</span><del>-                $wp_rewrite-&gt;add_rewrite_tag(&quot;%$taxonomy%&quot;, $tag, $args['query_var'] ? &quot;{$args['query_var']}=&quot; : &quot;taxonomy=$taxonomy&amp;term=&quot;);
-                $wp_rewrite-&gt;add_permastruct( $taxonomy, &quot;{$args['rewrite']['slug']}/%$taxonomy%&quot;, $args['rewrite'] );
</del><ins>+                add_rewrite_tag( &quot;%$taxonomy%&quot;, $tag, $args['query_var'] ? &quot;{$args['query_var']}=&quot; : &quot;taxonomy=$taxonomy&amp;term=&quot; );
+                add_permastruct( $taxonomy, &quot;{$args['rewrite']['slug']}/%$taxonomy%&quot;, $args['rewrite'] );
</ins><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         if ( is_null($args['show_ui']) )
</span></span></pre>
</div>
</div>

</body>
</html>