<!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>[16935] trunk/wp-admin/network/site-users.php: Use get_blog_option()

  isntead of raw SQL in site-users.</title>

</head>

<body>

<div id="msg">

<dl>

<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16935">16935</a></dd>

<dt>Author</dt> <dd>PeteMall</dd>

<dt>Date</dt> <dd>2010-12-15 09:05:10 +0000 (Wed, 15 Dec 2010)</dd>

</dl>

<h3>Log Message</h3>

<pre>Use get_blog_option() isntead of raw SQL in site-users. See <a href="http://trac.wordpress.org/ticket/14756">#14756</a></pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkwpadminnetworksiteusersphp">trunk/wp-admin/network/site-users.php</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkwpadminnetworksiteusersphp"></a>

<div class="modfile"><h4>Modified: trunk/wp-admin/network/site-users.php (16934 => 16935)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/wp-admin/network/site-users.php        2010-12-15 08:38:49 UTC (rev 16934)

+++ trunk/wp-admin/network/site-users.php        2010-12-15 09:05:10 UTC (rev 16935)

</span><span class="lines">@@ -43,6 +43,7 @@

</span><span class="cx">         // Roles are stored in memory, not the DB.

</span><span class="cx">         $editblog_roles = $wp_roles-&gt;roles;

</span><span class="cx"> }

</span><ins>+$default_role = get_blog_option( $id, 'default_role' );

</ins><span class="cx"> 

</span><span class="cx"> $action = $wp_list_table-&gt;current_action();

</span><span class="cx"> 

</span><span class="lines">@@ -237,7 +238,6 @@

</span><span class="cx">                         &lt;th scope=&quot;row&quot;&gt;&lt;?php _e( 'Role'); ?&gt;&lt;/th&gt;

</span><span class="cx">                         &lt;td&gt;&lt;select name=&quot;new_role&quot; id=&quot;new_role_0&quot;&gt;

</span><span class="cx">                         &lt;?php

</span><del>-                        $default_role = $wpdb-&gt;get_var( &quot;SELECT `option_value` FROM {$blog_prefix}options WHERE option_name = 'default_role'&quot; );

</del><span class="cx">                         reset( $editblog_roles );

</span><span class="cx">                         foreach ( $editblog_roles as $role =&gt; $role_assoc ){

</span><span class="cx">                                 $name = translate_user_role( $role_assoc['name'] );

</span><span class="lines">@@ -286,7 +286,7 @@

</span><span class="cx">         &lt;?php wp_nonce_field( 'add-user', '_wpnonce_add-user' ) ?&gt;

</span><span class="cx">         &lt;?php submit_button( __('Add New User'), 'primary', 'add-user' ); ?&gt;

</span><span class="cx"> &lt;/form&gt;

</span><ins>+&lt;?php endif; ?&gt;

</ins><span class="cx"> &lt;/div&gt;

</span><del>-&lt;?php endif; ?&gt;

</del><span class="cx"> &lt;?php

</span><span class="cx"> require('../admin-footer.php');

</span><span class="cx">\ No newline at end of file

</span></span></pre>

</div>

</div>

</body>

</html>