<!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>[12699] trunk/wp-includes: Mainstream things that don'
t need to be multisite only.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12699">12699</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-01-11 22:23:58 +0000 (Mon, 11 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Mainstream things that don't need to be multisite only. Formatting cleanups. see <a href="http://trac.wordpress.org/ticket/11644">#11644</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesauthortemplatephp">trunk/wp-includes/author-template.php</a></li>
<li><a href="#trunkwpincludescapabilitiesphp">trunk/wp-includes/capabilities.php</a></li>
<li><a href="#trunkwpincludestaxonomyphp">trunk/wp-includes/taxonomy.php</a></li>
<li><a href="#trunkwpincludesuserphp">trunk/wp-includes/user.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesauthortemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/author-template.php (12698 => 12699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/author-template.php 2010-01-11 22:08:49 UTC (rev 12698)
+++ trunk/wp-includes/author-template.php 2010-01-11 22:23:58 UTC (rev 12699)
</span><span class="lines">@@ -269,26 +269,20 @@
</span><span class="cx"> $return = '';
</span><span class="cx">
</span><span class="cx"> /** @todo Move select to get_authors(). */
</span><del>- if( is_multisite() ) {
- $users = get_users_of_blog();
- $author_ids = array();
- foreach ( (array) $users as $user ) {
- $author_ids[] = $user->user_id;
- }
- if ( count($author_ids) > 0 ) {
- $author_ids=implode(',', $author_ids );
- $authors = $wpdb->get_results( "SELECT ID, user_nicename from $wpdb->users WHERE ID IN($author_ids) " . ($exclude_admin ? "AND user_login <> 'admin' " : '') . "ORDER BY display_name" );
- } else {
- $authors = array();
- }
- } else {
- $authors = $wpdb->get_results("SELECT ID, user_nicename from $wpdb->users " . ($exclude_admin ? "WHERE user_login <> 'admin' " : '') . "ORDER BY display_name");
- }
</del><ins>+ $users = get_users_of_blog();
+ $author_ids = array();
+ foreach ( (array) $users as $user )
+ $author_ids[] = $user->user_id;
+ if ( count($author_ids) > 0 ) {
+ $author_ids = implode(',', $author_ids );
+ $authors = $wpdb->get_results( "SELECT ID, user_nicename from $wpdb->users WHERE ID IN($author_ids) " . ($exclude_admin ? "AND user_login <> 'admin' " : '') . "ORDER BY display_name" );
+ } else {
+ $authors = array();
+ }
</ins><span class="cx">
</span><span class="cx"> $author_count = array();
</span><del>- foreach ((array) $wpdb->get_results("SELECT DISTINCT post_author, COUNT(ID) AS count FROM $wpdb->posts WHERE post_type = 'post' AND " . get_private_posts_cap_sql( 'post' ) . " GROUP BY post_author") as $row) {
</del><ins>+ foreach ( (array) $wpdb->get_results("SELECT DISTINCT post_author, COUNT(ID) AS count FROM $wpdb->posts WHERE post_type = 'post' AND " . get_private_posts_cap_sql( 'post' ) . " GROUP BY post_author") as $row )
</ins><span class="cx"> $author_count[$row->post_author] = $row->count;
</span><del>- }
</del><span class="cx">
</span><span class="cx"> foreach ( (array) $authors as $author ) {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludescapabilitiesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/capabilities.php (12698 => 12699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/capabilities.php 2010-01-11 22:08:49 UTC (rev 12698)
+++ trunk/wp-includes/capabilities.php 2010-01-11 22:23:58 UTC (rev 12699)
</span><span class="lines">@@ -987,8 +987,8 @@
</span><span class="cx"> function current_user_can( $capability ) {
</span><span class="cx"> $current_user = wp_get_current_user();
</span><span class="cx">
</span><del>- if( is_multisite() && is_super_admin() )
- return true;
</del><ins>+ if ( is_multisite() && is_super_admin() )
+ return true;
</ins><span class="cx">
</span><span class="cx"> if ( empty( $current_user ) )
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkwpincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/taxonomy.php (12698 => 12699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/taxonomy.php 2010-01-11 22:08:49 UTC (rev 12698)
+++ trunk/wp-includes/taxonomy.php 2010-01-11 22:23:58 UTC (rev 12699)
</span><span class="lines">@@ -1417,30 +1417,30 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( ! $term_id = is_term($slug) ) {
</span><del>- if ( !is_multisite() ) {
- if ( false === $wpdb->insert( $wpdb->terms, compact( 'name', 'slug', 'term_group' ) ) )
- return new WP_Error('db_insert_error', __('Could not insert term into the database'), $wpdb->last_error);
- $term_id = (int) $wpdb->insert_id;
- } else {
- $maxterm = $wpdb->get_var( "SELECT max(term_id) FROM {$wpdb->terms}" );
- $term_id = mt_rand( $maxterm+100, $maxterm+4000 );
- if ( false === $wpdb->insert( $wpdb->terms, compact( 'term_id', 'name', 'slug', 'term_group' ) ) )
- return new WP_Error('db_insert_error', __('Could not insert term into the database'), $wpdb->last_error);
- }
</del><ins>+ if ( !is_multisite() ) {
+ if ( false === $wpdb->insert( $wpdb->terms, compact( 'name', 'slug', 'term_group' ) ) )
+ return new WP_Error('db_insert_error', __('Could not insert term into the database'), $wpdb->last_error);
+ $term_id = (int) $wpdb->insert_id;
+ } else {
+ $maxterm = $wpdb->get_var( "SELECT max(term_id) FROM {$wpdb->terms}" );
+ $term_id = mt_rand( $maxterm+100, $maxterm+4000 );
+ if ( false === $wpdb->insert( $wpdb->terms, compact( 'term_id', 'name', 'slug', 'term_group' ) ) )
+ return new WP_Error('db_insert_error', __('Could not insert term into the database'), $wpdb->last_error);
+ }
</ins><span class="cx"> } else if ( is_taxonomy_hierarchical($taxonomy) && !empty($parent) ) {
</span><span class="cx"> // If the taxonomy supports hierarchy and the term has a parent, make the slug unique
</span><span class="cx"> // by incorporating parent slugs.
</span><del>- $slug = wp_unique_term_slug($slug, (object) $args);
- if( !is_multisite() ) {
- if ( false === $wpdb->insert( $wpdb->terms, compact( 'name', 'slug', 'term_group' ) ) )
- return new WP_Error('db_insert_error', __('Could not insert term into the database'), $wpdb->last_error);
- $term_id = (int) $wpdb->insert_id;
- } else {
- $maxterm = $wpdb->get_var( "SELECT max(term_id) FROM {$wpdb->terms}" );
- $term_id = mt_rand( $maxterm+100, $maxterm+4000 );
- if ( false === $wpdb->insert( $wpdb->terms, compact( 'term_id','name', 'slug', 'term_group' ) ) )
- return new WP_Error('db_insert_error', __('Could not insert term into the database'), $wpdb->last_error);
- }
</del><ins>+ $slug = wp_unique_term_slug($slug, (object) $args);
+ if ( !is_multisite() ) {
+ if ( false === $wpdb->insert( $wpdb->terms, compact( 'name', 'slug', 'term_group' ) ) )
+ return new WP_Error('db_insert_error', __('Could not insert term into the database'), $wpdb->last_error);
+ $term_id = (int) $wpdb->insert_id;
+ } else {
+ $maxterm = $wpdb->get_var( "SELECT max(term_id) FROM {$wpdb->terms}" );
+ $term_id = mt_rand( $maxterm+100, $maxterm+4000 );
+ if ( false === $wpdb->insert( $wpdb->terms, compact( 'term_id','name', 'slug', 'term_group' ) ) )
+ return new WP_Error('db_insert_error', __('Could not insert term into the database'), $wpdb->last_error);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( empty($slug) ) {
</span></span></pre></div>
<a id="trunkwpincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/user.php (12698 => 12699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/user.php 2010-01-11 22:08:49 UTC (rev 12698)
+++ trunk/wp-includes/user.php 2010-01-11 22:23:58 UTC (rev 12699)
</span><span class="lines">@@ -279,7 +279,7 @@
</span><span class="cx"> global $wpdb, $blog_id;
</span><span class="cx"> if ( empty($id) )
</span><span class="cx"> $id = (int) $blog_id;
</span><del>- $blog_prefix = $wpdb->get_blog_prefix($id);
</del><ins>+ $blog_prefix = $wpdb->get_blog_prefix($id);
</ins><span class="cx"> $users = $wpdb->get_results( "SELECT user_id, user_id AS ID, user_login, display_name, user_email, meta_value FROM $wpdb->users, $wpdb->usermeta WHERE {$wpdb->users}.ID = {$wpdb->usermeta}.user_id AND meta_key = '{$blog_prefix}capabilities' ORDER BY {$wpdb->usermeta}.user_id" );
</span><span class="cx"> return $users;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>