<!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>[45391] trunk/src/wp-admin/includes/network.php: Networks and Sites: Readjust tabs in `wp-admin/includes/network.php` for (more or less) consistent alignment.</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 { white-space: pre-line; 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/45391">45391</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/45391","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>2019-05-23 23:34:40 +0000 (Thu, 23 May 2019)</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'>Networks and Sites: Readjust tabs in `wp-admin/includes/network.php` for (more or less) consistent alignment.
See <a href="https://core.trac.wordpress.org/ticket/47062">#47062</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesnetworkphp">trunk/src/wp-admin/includes/network.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesnetworkphp"></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/includes/network.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/network.php 2019-05-23 23:27:57 UTC (rev 45390)
+++ trunk/src/wp-admin/includes/network.php 2019-05-23 23:34:40 UTC (rev 45391)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -257,7 +257,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<div class="error inline"><p><strong>' . __( 'Warning:' ) . '</strong> ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '</p></div>';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $is_www = ( 0 === strpos( $hostname, 'www.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $is_www = ( 0 === strpos( $hostname, 'www.' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $is_www ) :
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <h3><?php esc_html_e( 'Server Address' ); ?></h3>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -462,24 +462,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <ol>
- <li><p>
- <?php
- printf(
- /* translators: 1: wp-config.php, 2: location of wp-config file, 3: translated version of "That's all, stop editing! Happy publishing." */
- __( 'Add the following to your %1$s file in %2$s <strong>above</strong> the line reading %3$s:' ),
- '<code>wp-config.php</code>',
- '<code>' . $location_of_wp_config . '</code>',
- /*
- * translators: This string should only be translated if wp-config-sample.php is localized.
- * You can check the localized release package or
- * https://i18n.svn.wordpress.org/<locale code>/branches/<wp version>/dist/wp-config-sample.php
- */
- '<code>/* ' . __( 'That’s all, stop editing! Happy publishing.' ) . ' */</code>'
- );
- ?>
- </p>
- <textarea class="code" readonly="readonly" cols="100" rows="7">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <ol>
+ <li><p>
+ <?php
+ printf(
+ /* translators: 1: wp-config.php, 2: location of wp-config file, 3: translated version of "That's all, stop editing! Happy publishing." */
+ __( 'Add the following to your %1$s file in %2$s <strong>above</strong> the line reading %3$s:' ),
+ '<code>wp-config.php</code>',
+ '<code>' . $location_of_wp_config . '</code>',
+ /*
+ * translators: This string should only be translated if wp-config-sample.php is localized.
+ * You can check the localized release package or
+ * https://i18n.svn.wordpress.org/<locale code>/branches/<wp version>/dist/wp-config-sample.php
+ */
+ '<code>/* ' . __( 'That’s all, stop editing! Happy publishing.' ) . ' */</code>'
+ );
+ ?>
+ </p>
+ <textarea class="code" readonly="readonly" cols="100" rows="7">
</ins><span class="cx" style="display: block; padding: 0 10px"> define('MULTISITE', true);
</span><span class="cx" style="display: block; padding: 0 10px"> define('SUBDOMAIN_INSTALL', <?php echo $subdomain_install ? 'true' : 'false'; ?>);
</span><span class="cx" style="display: block; padding: 0 10px"> define('DOMAIN_CURRENT_SITE', '<?php echo $hostname; ?>');
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -487,61 +487,61 @@
</span><span class="cx" style="display: block; padding: 0 10px"> define('SITE_ID_CURRENT_SITE', 1);
</span><span class="cx" style="display: block; padding: 0 10px"> define('BLOG_ID_CURRENT_SITE', 1);
</span><span class="cx" style="display: block; padding: 0 10px"> </textarea>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- $keys_salts = array(
- 'AUTH_KEY' => '',
- 'SECURE_AUTH_KEY' => '',
- 'LOGGED_IN_KEY' => '',
- 'NONCE_KEY' => '',
- 'AUTH_SALT' => '',
- 'SECURE_AUTH_SALT' => '',
- 'LOGGED_IN_SALT' => '',
- 'NONCE_SALT' => '',
- );
- foreach ( $keys_salts as $c => $v ) {
- if ( defined( $c ) ) {
- unset( $keys_salts[ $c ] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ $keys_salts = array(
+ 'AUTH_KEY' => '',
+ 'SECURE_AUTH_KEY' => '',
+ 'LOGGED_IN_KEY' => '',
+ 'NONCE_KEY' => '',
+ 'AUTH_SALT' => '',
+ 'SECURE_AUTH_SALT' => '',
+ 'LOGGED_IN_SALT' => '',
+ 'NONCE_SALT' => '',
+ );
+ foreach ( $keys_salts as $c => $v ) {
+ if ( defined( $c ) ) {
+ unset( $keys_salts[ $c ] );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- }
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $keys_salts ) ) {
- $keys_salts_str = '';
- $from_api = wp_remote_get( 'https://api.wordpress.org/secret-key/1.1/salt/' );
- if ( is_wp_error( $from_api ) ) {
- foreach ( $keys_salts as $c => $v ) {
- $keys_salts_str .= "\ndefine( '$c', '" . wp_generate_password( 64, true, true ) . "' );";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $keys_salts ) ) {
+ $keys_salts_str = '';
+ $from_api = wp_remote_get( 'https://api.wordpress.org/secret-key/1.1/salt/' );
+ if ( is_wp_error( $from_api ) ) {
+ foreach ( $keys_salts as $c => $v ) {
+ $keys_salts_str .= "\ndefine( '$c', '" . wp_generate_password( 64, true, true ) . "' );";
+ }
+ } else {
+ $from_api = explode( "\n", wp_remote_retrieve_body( $from_api ) );
+ foreach ( $keys_salts as $c => $v ) {
+ $keys_salts_str .= "\ndefine( '$c', '" . substr( array_shift( $from_api ), 28, 64 ) . "' );";
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else {
- $from_api = explode( "\n", wp_remote_retrieve_body( $from_api ) );
- foreach ( $keys_salts as $c => $v ) {
- $keys_salts_str .= "\ndefine( '$c', '" . substr( array_shift( $from_api ), 28, 64 ) . "' );";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $num_keys_salts = count( $keys_salts );
+ ?>
+ <p>
+ <?php
+ if ( 1 == $num_keys_salts ) {
+ printf(
+ /* translators: %s: wp-config.php */
+ __( 'This unique authentication key is also missing from your %s file.' ),
+ '<code>wp-config.php</code>'
+ );
+ } else {
+ printf(
+ /* translators: %s: wp-config.php */
+ __( 'These unique authentication keys are also missing from your %s file.' ),
+ '<code>wp-config.php</code>'
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
+ <?php _e( 'To make your installation more secure, you should also add:' ); ?>
+ </p>
+ <textarea class="code" readonly="readonly" cols="100" rows="<?php echo $num_keys_salts; ?>"><?php echo esc_textarea( $keys_salts_str ); ?></textarea>
+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $num_keys_salts = count( $keys_salts );
</del><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<p>
- <?php
- if ( 1 == $num_keys_salts ) {
- printf(
- /* translators: %s: wp-config.php */
- __( 'This unique authentication key is also missing from your %s file.' ),
- '<code>wp-config.php</code>'
- );
- } else {
- printf(
- /* translators: %s: wp-config.php */
- __( 'These unique authentication keys are also missing from your %s file.' ),
- '<code>wp-config.php</code>'
- );
- }
- ?>
- <?php _e( 'To make your installation more secure, you should also add:' ); ?>
- </p>
- <textarea class="code" readonly="readonly" cols="100" rows="<?php echo $num_keys_salts; ?>"><?php echo esc_textarea( $keys_salts_str ); ?></textarea>
- <?php
- }
- ?>
-</li>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ </li>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( iis7_supports_permalinks() ) :
</span><span class="cx" style="display: block; padding: 0 10px"> // IIS doesn't support RewriteBase, all your RewriteBase are belong to us
</span></span></pre>
</div>
</div>
</body>
</html>