<!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" />
<title>[39886] trunk/src/wp-includes/ms-functions.php: Users: In `wpmu_signup_blog()` and `wpmu_signup_user()`, pass unserialized signup meta data to `after_signup_site` and `after_signup_user` filters introduced in [34112], to match the documented value.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/39886">39886</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/39886","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-01-12 04:56:28 +0000 (Thu, 12 Jan 2017)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Users: In `wpmu_signup_blog()` and `wpmu_signup_user()`, pass unserialized signup meta data to `after_signup_site` and `after_signup_user` filters introduced in <a href="https://core.trac.wordpress.org/changeset/34112">[34112]</a>, to match the documented value.
Props MaximeCulea.
Fixes <a href="https://core.trac.wordpress.org/ticket/38781">#38781</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesmsfunctionsphp">trunk/src/wp-includes/ms-functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/ms-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-functions.php 2017-01-12 04:27:17 UTC (rev 39885)
+++ trunk/src/wp-includes/ms-functions.php 2017-01-12 04:56:28 UTC (rev 39886)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -664,13 +664,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $title The requested site title.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $user The user's requested login name.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $user_email The user's email address.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param array $meta By default, contains the requested privacy setting and lang_id.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $meta Optional. Signup meta data. By default, contains the requested privacy setting and lang_id.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wpmu_signup_blog( $domain, $path, $title, $user, $user_email, $meta = array() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $key = substr( md5( time() . wp_rand() . $domain ), 0, 16 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $meta = serialize($meta);
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->insert( $wpdb->signups, array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'domain' => $domain,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -680,7 +679,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_email' => $user_email,
</span><span class="cx" style="display: block; padding: 0 10px"> 'registered' => current_time('mysql', true),
</span><span class="cx" style="display: block; padding: 0 10px"> 'activation_key' => $key,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'meta' => $meta
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'meta' => serialize( $meta )
</ins><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -693,8 +692,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $title The requested site title.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $user The user's requested login name.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $user_email The user's email address.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $key The user's activation key
- * @param array $meta By default, contains the requested privacy setting and lang_id.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $key The user's activation key.
+ * @param array $meta Signup meta data. By default, contains the requested privacy setting and lang_id.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'after_signup_site', $domain, $path, $title, $user, $user_email, $key, $meta );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -711,7 +710,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $user The user's requested login name.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $user_email The user's email address.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param array $meta By default, this is an empty array.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $meta Optional. Signup meta data. Default empty array.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wpmu_signup_user( $user, $user_email, $meta = array() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -720,7 +719,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $user = preg_replace( '/\s+/', '', sanitize_user( $user, true ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $user_email = sanitize_email( $user_email );
</span><span class="cx" style="display: block; padding: 0 10px"> $key = substr( md5( time() . wp_rand() . $user_email ), 0, 16 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $meta = serialize($meta);
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->insert( $wpdb->signups, array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'domain' => '',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -730,7 +728,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_email' => $user_email,
</span><span class="cx" style="display: block; padding: 0 10px"> 'registered' => current_time('mysql', true),
</span><span class="cx" style="display: block; padding: 0 10px"> 'activation_key' => $key,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'meta' => $meta
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'meta' => serialize( $meta )
</ins><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -740,8 +738,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $user The user's requested login name.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $user_email The user's email address.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $key The user's activation key
- * @param array $meta Additional signup meta. By default, this is an empty array.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $key The user's activation key.
+ * @param array $meta Signup meta data. Default empty array.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'after_signup_user', $user, $user_email, $key, $meta );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>