<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[12933] trunk: fix potential global terms inconsistency, props rboren,
see #11644</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12933">12933</a></dd>
<dt>Author</dt> <dd>wpmuguru</dd>
<dt>Date</dt> <dd>2010-02-03 01:00:57 +0000 (Wed, 03 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>fix potential global terms inconsistency, props rboren, see <a href="http://trac.wordpress.org/ticket/11644">#11644</a></pre>
<h3>Modified Paths</h3>
<ul>
<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="#trunkwpincludesmsfunctionsphp">trunk/wp-includes/ms-functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesschemaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/schema.php (12932 => 12933)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/schema.php 2010-02-02 22:58:06 UTC (rev 12932)
+++ trunk/wp-admin/includes/schema.php 2010-02-03 01:00:57 UTC (rev 12933)
</span><span class="lines">@@ -656,17 +656,8 @@
</span><span class="cx">
</span><span class="cx"> if ( !is_multisite() ) {
</span><span class="cx">
</span><del>- /* translators: Default category slug */
- $cat_slug = sanitize_title( _x( 'Uncategorized', 'Default category slug' ) );
</del><ins>+ $wpdb->query( "INSERT INTO $wpdb->sitecategories (cat_id, cat_name, category_nicename, last_updated) SELECT term_id, `name`, slug, NOW() FROM $wpdb->terms" );
</ins><span class="cx">
</span><del>- $wpdb->insert( $wpdb->sitecategories, array( 'cat_ID' => 1, 'cat_name' => __('Uncategorized'), 'category_nicename' => $cat_slug, 'last_updated' => current_time( 'mysql', true ) ) );
-
- /* translators: Default link category slug */
- $cat_slug = sanitize_title( _x( 'Blogroll', 'Default link category slug' ) );
-
- $wpdb->insert( $wpdb->sitecategories, array( 'cat_ID' => 2, 'cat_name' => __('Blogroll'), 'category_nicename' => $cat_slug, 'last_updated' => current_time( 'mysql', true ) ) );
- $wpdb->query( "INSERT INTO $wpdb->sitecategories (cat_id, cat_name, category_nicename, last_updated) SELECT term_id, `name`, slug, NOW() FROM $wpdb->terms WHERE term_id > 2" );
-
</del><span class="cx"> $site_admins = array( $site_user->user_login );
</span><span class="cx"> $users = get_users_of_blog();
</span><span class="cx"> if ( $users ) {
</span></span></pre></div>
<a id="trunkwpadminincludesupgradephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/upgrade.php (12932 => 12933)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/upgrade.php 2010-02-02 22:58:06 UTC (rev 12932)
+++ trunk/wp-admin/includes/upgrade.php 2010-02-03 01:00:57 UTC (rev 12933)
</span><span class="lines">@@ -103,17 +103,41 @@
</span><span class="cx"> /* translators: Default category slug */
</span><span class="cx"> $cat_slug = sanitize_title(_x('Uncategorized', 'Default category slug'));
</span><span class="cx">
</span><del>- $wpdb->insert( $wpdb->terms, array('name' => $cat_name, 'slug' => $cat_slug, 'term_group' => 0) );
- $wpdb->insert( $wpdb->term_taxonomy, array('term_id' => '1', 'taxonomy' => 'category', 'description' => '', 'parent' => 0, 'count' => 1));
</del><ins>+ if ( is_multisite() ) {
+ $cat_id = $wpdb->get_var( $wpdb->prepare( "SELECT cat_ID FROM {$wpdb->sitecategories} WHERE category_nicename = %s", $cat_slug ) );
+ if ( $cat_id == null ) {
+ $wpdb->insert( $wpdb->sitecategories, array('cat_ID' => 0, 'cat_name' => $cat_name, 'category_nicename' => $cat_slug, 'last_updated' => current_time('mysql', true)) );
+ $cat_id = $wpdb->insert_id;
+ }
+ update_option('default_category', $cat_id);
+ } else {
+ $cat_id = 1;
+ }
</ins><span class="cx">
</span><ins>+ $wpdb->insert( $wpdb->terms, array('term_id' => $cat_id, 'name' => $cat_name, 'slug' => $cat_slug, 'term_group' => 0) );
+ $wpdb->insert( $wpdb->term_taxonomy, array('term_id' => $cat_id, 'taxonomy' => 'category', 'description' => '', 'parent' => 0, 'count' => 1));
+ $cat_tt_id = $wpdb->insert_id;
+
</ins><span class="cx"> // Default link category
</span><span class="cx"> $cat_name = __('Blogroll');
</span><span class="cx"> /* translators: Default link category slug */
</span><span class="cx"> $cat_slug = sanitize_title(_x('Blogroll', 'Default link category slug'));
</span><span class="cx">
</span><del>- $wpdb->insert( $wpdb->terms, array('name' => $cat_name, 'slug' => $cat_slug, 'term_group' => 0) );
- $wpdb->insert( $wpdb->term_taxonomy, array('term_id' => '2', 'taxonomy' => 'link_category', 'description' => '', 'parent' => 0, 'count' => 7));
</del><ins>+ if ( is_multisite() ) {
+ $blogroll_id = $wpdb->get_var( $wpdb->prepare( "SELECT cat_ID FROM {$wpdb->sitecategories} WHERE category_nicename = %s", $cat_slug ) );
+ if ( $blogroll_id == null ) {
+ $wpdb->insert( $wpdb->sitecategories, array('cat_ID' => 0, 'cat_name' => $cat_name, 'category_nicename' => $cat_slug, 'last_updated' => current_time('mysql', true)) );
+ $blogroll_id = $wpdb->insert_id;
+ }
+ update_option('default_link_category', $blogroll_id);
+ } else {
+ $blogroll_id = 2;
+ }
</ins><span class="cx">
</span><ins>+ $wpdb->insert( $wpdb->terms, array('term_id' => $blogroll_id, 'name' => $cat_name, 'slug' => $cat_slug, 'term_group' => 0) );
+ $wpdb->insert( $wpdb->term_taxonomy, array('term_id' => $blogroll_id, 'taxonomy' => 'link_category', 'description' => '', 'parent' => 0, 'count' => 7));
+ $blogroll_tt_id = $wpdb->insert_id;
+
</ins><span class="cx"> // Now drop in some default links
</span><span class="cx"> $default_links = array();
</span><span class="cx"> $default_links[] = array( 'link_url' => 'http://codex.wordpress.org/',
</span><span class="lines">@@ -153,7 +177,7 @@
</span><span class="cx">
</span><span class="cx"> foreach ( $default_links as $link ) {
</span><span class="cx"> $wpdb->insert( $wpdb->links, $link);
</span><del>- $wpdb->insert( $wpdb->term_relationships, array('term_taxonomy_id' => 2, 'object_id' => $wpdb->insert_id) );
</del><ins>+ $wpdb->insert( $wpdb->term_relationships, array('term_taxonomy_id' => $blogroll_tt_id, 'object_id' => $wpdb->insert_id) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // First post
</span><span class="lines">@@ -190,7 +214,7 @@
</span><span class="cx"> 'pinged' => '',
</span><span class="cx"> 'post_content_filtered' => ''
</span><span class="cx"> ));
</span><del>- $wpdb->insert( $wpdb->term_relationships, array('term_taxonomy_id' => 1, 'object_id' => 1) );
</del><ins>+ $wpdb->insert( $wpdb->term_relationships, array('term_taxonomy_id' => $cat_tt_id, 'object_id' => 1) );
</ins><span class="cx">
</span><span class="cx"> // Default comment
</span><span class="cx"> $first_comment_author = __('Mr WordPress');
</span></span></pre></div>
<a id="trunkwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-functions.php (12932 => 12933)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-functions.php 2010-02-02 22:58:06 UTC (rev 12932)
+++ trunk/wp-includes/ms-functions.php 2010-02-03 01:00:57 UTC (rev 12933)
</span><span class="lines">@@ -1419,24 +1419,6 @@
</span><span class="cx"> update_option('admin_email', '');
</span><span class="cx"> $wpdb->update( $wpdb->options, array('option_value' => ''), array('option_name' => 'admin_email') );
</span><span class="cx">
</span><del>- // Default category
- $wpdb->insert( $wpdb->terms, array('term_id' => 1, 'name' => __('Uncategorized'), 'slug' => sanitize_title(__('Uncategorized')), 'term_group' => 0) );
- $wpdb->insert( $wpdb->term_taxonomy, array('term_id' => 1, 'taxonomy' => 'category', 'description' => '', 'parent' => 0, 'count' => 1) );
-
- // Default link category
- $cat_name = __('Blogroll');
- $cat_slug = sanitize_title($cat_name);
-
- $blogroll_id = $wpdb->get_var( $wpdb->prepare( "SELECT cat_ID FROM {$wpdb->sitecategories} WHERE category_nicename = %s", $cat_slug ) );
-
- if ( $blogroll_id == null ) {
- $wpdb->insert( $wpdb->sitecategories, array('cat_ID' => 0, 'cat_name' => $cat_name, 'category_nicename' => $cat_slug, 'last_updated' => current_time('mysql', true)) );
- $blogroll_id = $wpdb->insert_id;
- }
- $wpdb->insert( $wpdb->terms, array('term_id' => $blogroll_id, 'name' => $cat_name, 'slug' => $cat_slug, 'term_group' => 0) );
- $wpdb->insert( $wpdb->term_taxonomy, array('term_id' => $blogroll_id, 'taxonomy' => 'link_category', 'description' => '', 'parent' => 0, 'count' => 2) );
- update_option('default_link_category', $blogroll_id);
-
</del><span class="cx"> // remove all perms
</span><span class="cx"> $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE meta_key = %s", $table_prefix.'user_level') );
</span><span class="cx"> $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE meta_key = %s", $table_prefix.'capabilities') );
</span></span></pre>
</div>
</div>
</body>
</html>