Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CMSP-150] Update network setup #49

Merged
merged 6 commits into from
Jun 4, 2024
Merged

[CMSP-150] Update network setup #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b4f11c2
always require the network setup if allow multisite is true
jazzsequence Jun 4, 2024
d05ccf7
remove tab before ob_start
jazzsequence Jun 4, 2024
4bf9b83
reduce the number of lines in the textarea
jazzsequence Jun 4, 2024
4eabfa6
use wp_kses_post instead of esc_html
jazzsequence Jun 4, 2024
2e89a63
ignore the lint warning about indentation
jazzsequence Jun 4, 2024
3b27c6a
bump version to 1.4.4
jazzsequence Jun 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions inc/network/includes-network.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,7 @@ function network_step2( $errors = false ) {
<?php
printf(
/* translators: 1: wp-config.php, 2: Location of wp-config file, 3: Translated version of "That's all, stop editing! Happy publishing." */
esc_html__( 'Add the following to your %1$s file in %2$s <strong>above</strong> the line reading %3$s:' ),
wp_kses_post( __( 'Add the following to your %1$s file in %2$s <strong>above</strong> the line reading %3$s:' ) ),
'<code>' . $config_filename . '</code>', // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
'<code>' . $location_of_wp_config . '</code>', // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
// translators: This string should only be translated if wp-config-sample.php is localized.
Expand All @@ -456,8 +456,8 @@ function network_step2( $errors = false ) {
);
?>
</label></p>
<textarea id="network-wpconfig-rules" class="code" readonly="readonly" cols="100" rows="31" aria-describedby="network-wpconfig-rules-description">
<?php ob_start(); ?>
<textarea id="network-wpconfig-rules" class="code" readonly="readonly" cols="100" rows="8" aria-describedby="network-wpconfig-rules-description">
<?php ob_start(); // phpcs:ignore Generic.WhiteSpace.ScopeIndent.Incorrect ?>
define( 'MULTISITE', true );
define( 'SUBDOMAIN_INSTALL', <?php echo $subdomain_install ? 'true' : 'false'; ?> );
// Use PANTHEON_HOSTNAME if in a Pantheon environment, otherwise use HTTP_HOST.
Expand Down
9 changes: 4 additions & 5 deletions pantheon.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
* Plugin Name: Pantheon
* Plugin URI: https://pantheon.io/
* Description: Building on Pantheon's and WordPress's strengths, together.
* Version: 1.4.3
* Version: 1.4.4
* Author: Pantheon
* Author URI: https://pantheon.io/
*
* @package pantheon
*/

define( 'PANTHEON_MU_PLUGIN_VERSION', '1.4.3' );
define( 'PANTHEON_MU_PLUGIN_VERSION', '1.4.4' );

if ( isset( $_ENV['PANTHEON_ENVIRONMENT'] ) ) {
require_once 'inc/functions.php';
Expand Down Expand Up @@ -46,9 +46,8 @@
define( 'WP_ALLOW_MULTISITE', true );
}
if ( defined( 'WP_ALLOW_MULTISITE' ) && WP_ALLOW_MULTISITE ) {
if ( defined( 'MULTISITE' ) && MULTISITE ) {
require_once 'inc/pantheon-network-setup.php';
} else {
require_once 'inc/pantheon-network-setup.php';
if ( ! defined( 'MULTISITE' ) && MULTISITE ) {
require_once 'inc/pantheon-multisite-finalize.php';
}
}
Expand Down
Loading