<!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>[38619] trunk/src: Upgrade/Install: Automatically log users in after installation.</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/38619">38619</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/38619","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>johnbillion</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-09-18 11:41:53 +0000 (Sun, 18 Sep 2016)</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'>Upgrade/Install: Automatically log users in after installation.
This change means that after entering their site's settings upon installation, users are immediately logged in and redirected to the admin dashboard, instead of being presented with the 'Success!' screen and then being asked to log in. This reduces friction and reduces the number of steps for installation.
Fixes <a href="https://core.trac.wordpress.org/ticket/34084">#34084</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmininstallphp">trunk/src/wp-admin/install.php</a></li>
<li><a href="#trunksrcwpincludesdefaultconstantsphp">trunk/src/wp-includes/default-constants.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmininstallphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/install.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/install.php 2016-09-17 21:49:49 UTC (rev 38618)
+++ trunk/src/wp-admin/install.php 2016-09-18 11:41:53 UTC (rev 38619)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -330,7 +330,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts_to_print[] = 'user-profile';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- display_header();
</del><span class="cx" style="display: block; padding: 0 10px"> // Fill in the data we gathered
</span><span class="cx" style="display: block; padding: 0 10px"> $weblog_title = isset( $_POST['weblog_title'] ) ? trim( wp_unslash( $_POST['weblog_title'] ) ) : '';
</span><span class="cx" style="display: block; padding: 0 10px"> $user_name = isset($_POST['user_name']) ? trim( wp_unslash( $_POST['user_name'] ) ) : '';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -343,21 +342,26 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $error = false;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $user_name ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // TODO: poka-yoke
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ display_header();
</ins><span class="cx" style="display: block; padding: 0 10px"> display_setup_form( __( 'Please provide a valid username.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $error = true;
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $user_name != sanitize_user( $user_name, true ) ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ display_header();
</ins><span class="cx" style="display: block; padding: 0 10px"> display_setup_form( __( 'The username you provided has invalid characters.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $error = true;
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $admin_password != $admin_password_check ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // TODO: poka-yoke
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ display_header();
</ins><span class="cx" style="display: block; padding: 0 10px"> display_setup_form( __( 'Your passwords do not match. Please try again.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $error = true;
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( empty( $admin_email ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // TODO: poka-yoke
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ display_header();
</ins><span class="cx" style="display: block; padding: 0 10px"> display_setup_form( __( 'You must provide an email address.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $error = true;
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! is_email( $admin_email ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // TODO: poka-yoke
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ display_header();
</ins><span class="cx" style="display: block; padding: 0 10px"> display_setup_form( __( 'Sorry, that isn’t a valid email address. Email addresses look like <code>username@example.com</code>.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $error = true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -365,6 +369,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $error === false ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->show_errors();
</span><span class="cx" style="display: block; padding: 0 10px"> $result = wp_install( $weblog_title, $user_name, $admin_email, $public, '', wp_slash( $admin_password ), $loaded_language );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Log the user in and send them to wp-admin:
+ if ( ! headers_sent() ) {
+ wp_set_auth_cookie( $result['user_id'], true, is_ssl() );
+ wp_redirect( admin_url() );
+ exit;
+ }
+
+ // If headers have already been sent, fall back to a "Success!" message:
+ display_header();
</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"> <h1><?php _e( 'Success!' ); ?></h1>
</span></span></pre></div>
<a id="trunksrcwpincludesdefaultconstantsphp"></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/default-constants.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/default-constants.php 2016-09-17 21:49:49 UTC (rev 38618)
+++ trunk/src/wp-includes/default-constants.php 2016-09-18 11:41:53 UTC (rev 38619)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -205,7 +205,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $siteurl )
</span><span class="cx" style="display: block; padding: 0 10px"> define( 'COOKIEHASH', md5( $siteurl ) );
</span><span class="cx" style="display: block; padding: 0 10px"> else
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- define( 'COOKIEHASH', '' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ define( 'COOKIEHASH', md5( wp_guess_url() ) );
</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></pre>
</div>
</div>
</body>
</html>