<!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>[17084] trunk: Revert get_users_of_blog() to 3.0 behavior and deprecate.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17084">17084</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-12-20 16:25:35 +0000 (Mon, 20 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Revert get_users_of_blog() to 3.0 behavior and deprecate. Use get_users() in core. Props scribu. fixes <a href="http://trac.wordpress.org/ticket/15854">#15854</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesmsphp">trunk/wp-admin/includes/ms.php</a></li>
<li><a href="#trunkwpadminnetworkeditphp">trunk/wp-admin/network/edit.php</a></li>
<li><a href="#trunkwpincludesdeprecatedphp">trunk/wp-includes/deprecated.php</a></li>
<li><a href="#trunkwpincludesuserphp">trunk/wp-includes/user.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesmsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/ms.php (17083 => 17084)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/ms.php 2010-12-20 16:21:42 UTC (rev 17083)
+++ trunk/wp-admin/includes/ms.php 2010-12-20 16:25:35 UTC (rev 17084)
</span><span class="lines">@@ -65,12 +65,12 @@
</span><span class="cx">
</span><span class="cx"> do_action( 'delete_blog', $blog_id, $drop );
</span><span class="cx">
</span><del>- $users = get_users_of_blog( $blog_id );
</del><ins>+ $users = get_users( array( 'blog_id' => $blog_id, 'fields' => 'ids' ) );
</ins><span class="cx">
</span><span class="cx"> // Remove users from this blog.
</span><span class="cx"> if ( ! empty( $users ) ) {
</span><del>- foreach ( $users as $user ) {
- remove_user_from_blog( $user->ID, $blog_id) ;
</del><ins>+ foreach ( $users as $user_id ) {
+ remove_user_from_blog( $user_id, $blog_id) ;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminnetworkeditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/edit.php (17083 => 17084)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/edit.php 2010-12-20 16:21:42 UTC (rev 17083)
+++ trunk/wp-admin/network/edit.php 2010-12-20 16:25:35 UTC (rev 17084)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> <br /><fieldset><p><legend><?php printf( __( "What should be done with posts and links owned by <em>%s</em>?" ), $delete_user->user_login ); ?></legend></p>
</span><span class="cx"> <?php
</span><span class="cx"> foreach ( (array) $blogs as $key => $details ) {
</span><del>- $blog_users = get_users_of_blog( $details->userblog_id );
</del><ins>+ $blog_users = get_users( array( 'blog_id' => $details->userblog_id ) );
</ins><span class="cx"> if ( is_array( $blog_users ) && !empty( $blog_users ) ) {
</span><span class="cx"> $user_site = "<a href='" . esc_url( get_home_url( $details->userblog_id ) ) . "'>{$details->blogname}</a>";
</span><span class="cx"> $user_dropdown = "<select name='blog[$val][{$key}]'>";
</span></span></pre></div>
<a id="trunkwpincludesdeprecatedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/deprecated.php (17083 => 17084)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/deprecated.php 2010-12-20 16:21:42 UTC (rev 17083)
+++ trunk/wp-includes/deprecated.php 2010-12-20 16:25:35 UTC (rev 17084)
</span><span class="lines">@@ -2416,6 +2416,31 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Get users for the blog.
+ *
+ * For setups that use the multi-blog feature. Can be used outside of the
+ * multi-blog feature.
+ *
+ * @since 2.2.0
+ * @deprecated 3.1.0
+ * @uses $wpdb WordPress database object for queries
+ * @uses $blog_id The Blog id of the blog for those that use more than one blog
+ *
+ * @param int $id Blog ID.
+ * @return array List of users that are part of that Blog ID
+ */
+function get_users_of_blog( $id = '' ) {
+ _deprecated_function( __FUNCTION__, '3.1', 'get_users()' );
+
+ global $wpdb, $blog_id;
+ if ( empty($id) )
+ $id = (int) $blog_id;
+ $blog_prefix = $wpdb->get_blog_prefix($id);
+ $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" );
+ return $users;
+}
+
+/**
</ins><span class="cx"> * Enable/disable automatic general feed link outputting.
</span><span class="cx"> *
</span><span class="cx"> * @since 2.8.0
</span></span></pre></div>
<a id="trunkwpincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/user.php (17083 => 17084)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/user.php 2010-12-20 16:21:42 UTC (rev 17083)
+++ trunk/wp-includes/user.php 2010-12-20 16:25:35 UTC (rev 17084)
</span><span class="lines">@@ -619,26 +619,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Get users for the blog.
- *
- * For setups that use the multi-blog feature. Can be used outside of the
- * multi-blog feature.
- *
- * @since 2.2.0
- * @uses get_users() for queries
- * @uses $blog_id The Blog id of the blog for those that use more than one blog
- *
- * @param int $id Blog ID.
- * @return array List of users that are part of that Blog ID
- */
-function get_users_of_blog( $id = '' ) {
- if ( empty( $id ) )
- $id = get_current_blog_id();
-
- return get_users( array( 'blog_id' => $id ) );
-}
-
-/**
</del><span class="cx"> * Get the blogs a user belongs to.
</span><span class="cx"> *
</span><span class="cx"> * @since 3.0.0
</span></span></pre>
</div>
</div>
</body>
</html>