<!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>[16179] trunk/wp-includes/ms-functions.php: Don'
t mangle the primary_blog option when trying to fix it.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16179">16179</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2010-11-04 09:31:58 +0000 (Thu, 04 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't mangle the primary_blog option when trying to fix it. Don't set people to be a subscriber on a blog they already have a role for. See <a href="http://trac.wordpress.org/ticket/15316">#15316</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesmsfunctionsphp">trunk/wp-includes/ms-functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-functions.php (16178 => 16179)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-functions.php 2010-11-04 09:06:45 UTC (rev 16178)
+++ trunk/wp-includes/ms-functions.php 2010-11-04 09:31:58 UTC (rev 16179)
</span><span class="lines">@@ -79,17 +79,17 @@
</span><span class="cx">
</span><span class="cx"> $primary_blog = get_user_meta( $user_id, 'primary_blog', true );
</span><span class="cx"> $first_blog = current($blogs);
</span><del>- if ( $primary_blog ) {
</del><ins>+ if ( false !== $primary_blog ) {
</ins><span class="cx"> if ( ! isset( $blogs[ $primary_blog ] ) ) {
</span><del>- add_user_to_blog( $first_blog->blog_id, $user_id, 'subscriber' );
- update_user_meta( $user_id, 'primary_blog', $first_blog->blog_id );
</del><ins>+ update_user_meta( $user_id, 'primary_blog', $first_blog->userblog_id );
</ins><span class="cx"> $primary = $first_blog;
</span><span class="cx"> } else {
</span><span class="cx"> $primary = get_blog_details( $primary_blog );
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><del>- add_user_to_blog( $first_blog->blog_id, $user_id, 'subscriber' );
- update_user_meta( $user_id, 'primary_blog', $first_blog->blog_id );
</del><ins>+ //TODO Review this call to add_user_to_blog too - to get here the user must have a role on this blog?
+ add_user_to_blog( $first_blog->userblog_id, $user_id, 'subscriber' );
+ update_user_meta( $user_id, 'primary_blog', $first_blog->userblog_id );
</ins><span class="cx"> $primary = $first_blog;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>