Skip to content

Commit

Permalink
Merge branch 'staging' into trash-alert-change
Browse files Browse the repository at this point in the history
  • Loading branch information
@RitikaDesai98
RitikaDesai98 authored Dec 2, 2024
2 parents b480c4c + 843abf5 commit 70669c7
Show file tree
Hide file tree
Showing 2,134 changed files with 427,784 additions and 312,573 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ wp/wp-content/plugins/meta-box-*
wp/wp-content/plugins/mb-*
wp/wp-content/plugins/mb-relationships
wp/wp-content/plugins/two-factor-authentication-premium/
wp/wp-content/plugins/wpfront-user-role-editor/
wp/wp-content/plugins/wpfront-user-role-editor-personal-pro/
wp/wp-content/plugins/wp-nested-pages/
wp/wp-content/plugins/meta-box-text-limiter/
Expand Down
6 changes: 6 additions & 0 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 4 additions & 15 deletions scripts/composer.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,28 +44,16 @@ echo '
"cityofphiladelphia/duplicate-and-merge-posts": "dev-'$GITHUB_BRANCH'",
"cityofphiladelphia/google-calendar-events": "dev-'$GITHUB_BRANCH'",
"cityofphiladelphia/restrict-categories": "dev-'$GITHUB_BRANCH'",
"cityofphiladelphia/mb-revision": "dev-'$GITHUB_BRANCH'",
"kylephillips/nestedpages": "dev-main",
"meta-box/mb-admin-columns":"dev-master",
"meta-box/mb-settings-page":"dev-master",
"meta-box/mb-term-meta":"dev-master",
"meta-box/meta-box-columns":"dev-master",
"meta-box/meta-box-conditional-logic":"dev-master",
"meta-box/meta-box-group":"dev-master",
"meta-box/meta-box-include-exclude":"dev-master",
"meta-box/meta-box-tabs":"dev-master",
"meta-box/meta-box-tooltip":"dev-master",
"wpackagist-plugin/better-search-replace":"1.4.3",
"wpackagist-plugin/disable-gutenberg":"2.8.1",
"wpackagist-plugin/jwt-auth":"2.1.3",
"wpackagist-plugin/gathercontent-import":"3.2.19",
"wpackagist-plugin/easy-wp-smtp":"^2.2.0",
"wpackagist-plugin/admin-email-as-from-address":"^1.2",
"wpackagist-plugin/jwt-authentication-for-wp-rest-api":"1.3.2",
"wpackagist-plugin/meta-box":"^5.10.1",
"wpackagist-plugin/mb-rest-api":"^2.0.1",
"wpackagist-plugin/mb-relationships":"^1.11.2",
"wpackagist-plugin/meta-box-text-limiter":"^1.1.3",
"wpackagist-plugin/meta-box":"^5.10.3",
"meta-box/meta-box-aio":"dev-master",
"wpackagist-plugin/miniorange-saml-20-single-sign-on":"^5.0.7",
"wpackagist-plugin/reusable-text-blocks":"^1.5.3",
"wpackagist-plugin/amazon-s3-and-cloudfront":"^2.6.2",
Expand All @@ -74,7 +62,8 @@ echo '
"wpackagist-plugin/wordpress-importer":"^0.8",
"wpackagist-plugin/tinymce-advanced":"^5.9.2",
"nesbot/carbon": "^2.64",
"google/apiclient": "^2.13"
"google/apiclient": "^2.13",
"wpackagist-plugin/litespeed-cache": "^6.5.2"
},
"config": {
"allow-plugins": {
Expand Down
2 changes: 1 addition & 1 deletion wp/license.txt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
WordPress - Web publishing software

Copyright 2011-2022 by the contributors
Copyright 2011-2024 by the contributors

This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
51 changes: 24 additions & 27 deletions wp/wp-activate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
*/
function do_activate_header() {
/**
* Fires before the Site Activation page is loaded.
* Fires within the `<head>` section of the Site Activation page.
*
* Fires on the {@see 'wp_head'} action.
*
Expand All @@ -105,10 +105,11 @@ function do_activate_header() {
function wpmu_activate_stylesheet() {
?>
<style type="text/css">
form { margin-top: 2em; }
#submit, #key { width: 90%; font-size: 24px; }
#language { margin-top: .5em; }
.error { background: #f66; }
.wp-activate-container { width: 90%; margin: 0 auto; }
.wp-activate-container form { margin-top: 2em; }
#submit, #key { width: 100%; font-size: 24px; box-sizing: border-box; }
#language { margin-top: 0.5em; }
.wp-activate-container .error { background: #f66; color: #333; }
span.h3 { padding: 0 8px; font-size: 1.3em; font-weight: 600; }
</style>
<?php
Expand All @@ -119,18 +120,18 @@ function wpmu_activate_stylesheet() {

get_header( 'wp-activate' );

$blog_details = get_blog_details();
$blog_details = get_site();
?>

<div id="signup-content" class="widecolumn">
<div class="wp-activate-container">
<?php if ( ! $key ) { ?>

<h2><?php _e( 'Activation Key Required' ); ?></h2>
<form name="activateform" id="activateform" method="post" action="<?php echo network_site_url( $blog_details->path . 'wp-activate.php' ); ?>">
<form name="activateform" id="activateform" method="post" action="<?php echo esc_url( network_site_url( $blog_details->path . 'wp-activate.php' ) ); ?>">
<p>
<label for="key"><?php _e( 'Activation Key:' ); ?></label>
<br /><input type="text" name="key" id="key" value="" size="50" />
<br /><input type="text" name="key" id="key" value="" size="50" autofocus="autofocus" />
</p>
<p class="submit">
<input id="submit" type="submit" name="Submit" class="submit" value="<?php esc_attr_e( 'Activate' ); ?>" />
Expand All @@ -149,38 +150,38 @@ function wpmu_activate_stylesheet() {
printf(
/* translators: 1: Login URL, 2: Username, 3: User email address, 4: Lost password URL. */
__( 'Your account has been activated. You may now <a href="%1$s">log in</a> to the site using your chosen username of &#8220;%2$s&#8221;. Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%4$s">reset your password</a>.' ),
network_site_url( $blog_details->path . 'wp-login.php', 'login' ),
$signup->user_login,
$signup->user_email,
wp_lostpassword_url()
esc_url( network_site_url( $blog_details->path . 'wp-login.php', 'login' ) ),
esc_html( $signup->user_login ),
esc_html( $signup->user_email ),
esc_url( wp_lostpassword_url() )
);
} else {
printf(
/* translators: 1: Site URL, 2: Username, 3: User email address, 4: Lost password URL. */
__( 'Your site at %1$s is active. You may now log in to your site using your chosen username of &#8220;%2$s&#8221;. Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%4$s">reset your password</a>.' ),
sprintf( '<a href="http://%1$s%2$s">%1$s%2$s</a>', $signup->domain, $blog_details->path ),
$signup->user_login,
$signup->user_email,
wp_lostpassword_url()
sprintf( '<a href="http://%1$s">%1$s</a>', esc_url( $signup->domain . $blog_details->path ) ),
esc_html( $signup->user_login ),
esc_html( $signup->user_email ),
esc_url( wp_lostpassword_url() )
);
}
echo '</p>';
} elseif ( null === $result || is_wp_error( $result ) ) {
?>
<h2><?php _e( 'An error occurred during the activation' ); ?></h2>
<?php if ( is_wp_error( $result ) ) : ?>
<p><?php echo $result->get_error_message(); ?></p>
<p><?php echo esc_html( $result->get_error_message() ); ?></p>
<?php endif; ?>
<?php
} else {
$url = isset( $result['blog_id'] ) ? get_home_url( (int) $result['blog_id'] ) : '';
$url = isset( $result['blog_id'] ) ? esc_url( get_home_url( (int) $result['blog_id'] ) ) : '';
$user = get_userdata( (int) $result['user_id'] );
?>
<h2><?php _e( 'Your account is now active!' ); ?></h2>

<div id="signup-welcome">
<p><span class="h3"><?php _e( 'Username:' ); ?></span> <?php echo $user->user_login; ?></p>
<p><span class="h3"><?php _e( 'Password:' ); ?></span> <?php echo $result['password']; ?></p>
<p><span class="h3"><?php _e( 'Username:' ); ?></span> <?php echo esc_html( $user->user_login ); ?></p>
<p><span class="h3"><?php _e( 'Password:' ); ?></span> <?php echo esc_html( $result['password'] ); ?></p>
</div>

<?php
Expand All @@ -192,7 +193,7 @@ function wpmu_activate_stylesheet() {
<p class="view">
<?php
/* translators: 1: Site URL, 2: Login URL. */
printf( __( 'Your account is now activated. <a href="%1$s">View your site</a> or <a href="%2$s">Log in</a>' ), $url, esc_url( $login_url ) );
printf( __( 'Your account is now activated. <a href="%1$s">View your site</a> or <a href="%2$s">Log in</a>' ), esc_url( $url ), esc_url( $login_url ) );
?>
</p>
<?php else : ?>
Expand All @@ -201,8 +202,8 @@ function wpmu_activate_stylesheet() {
printf(
/* translators: 1: Login URL, 2: Network home URL. */
__( 'Your account is now activated. <a href="%1$s">Log in</a> or go back to the <a href="%2$s">homepage</a>.' ),
network_site_url( $blog_details->path . 'wp-login.php', 'login' ),
network_home_url( $blog_details->path )
esc_url( network_site_url( $blog_details->path . 'wp-login.php', 'login' ) ),
esc_url( network_home_url( $blog_details->path ) )
);
?>
</p>
Expand All @@ -213,9 +214,5 @@ function wpmu_activate_stylesheet() {
?>
</div>
</div>
<script type="text/javascript">
var key_input = document.getElementById('key');
key_input && key_input.focus();
</script>
<?php
get_footer( 'wp-activate' );
Loading

0 comments on commit 70669c7

Please sign in to comment.