Skip to content

Commit

Permalink
Merge pull request #1031 from Chassis/update-wordpress-630
Browse files Browse the repository at this point in the history
  • Loading branch information
BronsonQuick committed Aug 8, 2023
2 parents c0d4772 + 63bb8f9 commit e5cb80e
Show file tree
Hide file tree
Showing 1,113 changed files with 141,718 additions and 90,751 deletions.
4 changes: 2 additions & 2 deletions wp/readme.html
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,14 @@ <h2>Migrating from other systems</h2>

<h2>System Requirements</h2>
<ul>
<li><a href="https://secure.php.net/">PHP</a> version <strong>5.6.20</strong> or greater.</li>
<li><a href="https://secure.php.net/">PHP</a> version <strong>7.0</strong> or greater.</li>
<li><a href="https://www.mysql.com/">MySQL</a> version <strong>5.0</strong> or greater.</li>
</ul>

<h3>Recommendations</h3>
<ul>
<li><a href="https://secure.php.net/">PHP</a> version <strong>7.4</strong> or greater.</li>
<li><a href="https://www.mysql.com/">MySQL</a> version <strong>5.7</strong> or greater OR <a href="https://mariadb.org/">MariaDB</a> version <strong>10.3</strong> or greater.</li>
<li><a href="https://www.mysql.com/">MySQL</a> version <strong>5.7</strong> or greater OR <a href="https://mariadb.org/">MariaDB</a> version <strong>10.4</strong> or greater.</li>
<li>The <a href="https://httpd.apache.org/docs/2.2/mod/mod_rewrite.html">mod_rewrite</a> Apache module.</li>
<li><a href="https://wordpress.org/news/2016/12/moving-toward-ssl/">HTTPS</a> support.</li>
<li>A link to <a href="https://wordpress.org/">wordpress.org</a> on your site.</li>
Expand Down
4 changes: 2 additions & 2 deletions wp/wp-activate.php
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 Down Expand Up @@ -120,7 +120,7 @@ function wpmu_activate_stylesheet() {

get_header( 'wp-activate' );

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

<div id="signup-content" class="widecolumn">
Expand Down
251 changes: 114 additions & 137 deletions wp/wp-admin/about.php

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions wp/wp-admin/admin-header.php
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
<?php

/**
* Enqueue scripts for all admin pages.
* Fires when enqueuing scripts for all admin pages.
*
* @since 2.8.0
*
Expand Down Expand Up @@ -242,7 +242,7 @@
$admin_body_classes = apply_filters( 'admin_body_class', '' );
$admin_body_classes = ltrim( $admin_body_classes . ' ' . $admin_body_class );
?>
<body class="wp-admin wp-core-ui no-js <?php echo $admin_body_classes; ?>">
<body class="wp-admin wp-core-ui no-js <?php echo esc_attr( $admin_body_classes ); ?>">
<script type="text/javascript">
document.body.className = document.body.className.replace('no-js','js');
</script>
Expand Down
2 changes: 1 addition & 1 deletion wp/wp-admin/admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@
define( 'WP_IMPORTING', true );

/**
* Whether to filter imported data through kses on import.
* Filters whether to filter imported data through kses on import.
*
* Multisite uses this hook to filter all data through kses by default,
* as a super administrator may be assisting an untrusted user.
Expand Down
2 changes: 1 addition & 1 deletion wp/wp-admin/comment.php
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@
comment_footer_die( __( 'Sorry, you are not allowed to edit comments on this post.' ) );
}

if ( wp_get_referer() && ! $noredir && false === strpos( wp_get_referer(), 'comment.php' ) ) {
if ( wp_get_referer() && ! $noredir && ! str_contains( wp_get_referer(), 'comment.php' ) ) {
$redir = wp_get_referer();
} elseif ( wp_get_original_referer() && ! $noredir ) {
$redir = wp_get_original_referer();
Expand Down
109 changes: 109 additions & 0 deletions wp/wp-admin/contribute.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
<?php
/**
* Contribute administration panel.
*
* @package WordPress
* @subpackage Administration
*/

/** WordPress Administration Bootstrap */
require_once __DIR__ . '/admin.php';

// Used in the HTML title tag.
$title = __( 'Get Involved' );

list( $display_version ) = explode( '-', get_bloginfo( 'version' ) );

require_once ABSPATH . 'wp-admin/admin-header.php';
?>
<div class="wrap about__container">

<div class="about__header">
<div class="about__header-title">
<h1>
<?php _e( 'Get Involved' ); ?>
</h1>
</div>

<div class="about__header-text">
<?php _e( 'Be the future of WordPress' ); ?>
</div>
</div>

<nav class="about__header-navigation nav-tab-wrapper wp-clearfix" aria-label="<?php esc_attr_e( 'Secondary menu' ); ?>">
<a href="about.php" class="nav-tab"><?php _e( 'What&#8217;s New' ); ?></a>
<a href="credits.php" class="nav-tab"><?php _e( 'Credits' ); ?></a>
<a href="freedoms.php" class="nav-tab"><?php _e( 'Freedoms' ); ?></a>
<a href="privacy.php" class="nav-tab"><?php _e( 'Privacy' ); ?></a>
<a href="contribute.php" class="nav-tab nav-tab-active" aria-current="page"><?php _e( 'Get Involved' ); ?></a>
</nav>

<div class="about__section has-2-columns is-wider-right">
<div class="column about__image">
<img src="<?php echo esc_url( admin_url( 'images/contribute-main.svg?ver=6.3' ) ); ?>" alt="" />
</div>
<div class="column is-vertically-aligned-center">
<p><?php _e( 'Do you use WordPress for work, for personal projects, or even just for fun? You can help shape the long-term success of the open source project that powers millions of websites around the world.' ); ?></p>
<p><?php _e( 'Join the WordPress contributor community and connect with others who are passionate about maintaining a free and open web.' ); ?></p>

<ul>
<li><?php _e( 'Be part of a global open source community.' ); ?></li>
<li><?php _e( 'Apply your skills or learn new ones.' ); ?></li>
<li><?php _e( 'Grow your network and make friends.' ); ?></li>
</ul>
</div>
</div>

<div class="about__section has-2-columns is-wider-left">
<div class="column is-vertically-aligned-center">
<h3><?php _e( 'No-code contribution' ); ?></h3>
<p><?php _e( 'WordPress may thrive on technical contributions, but you don&#8217;t have to code to contribute. Here are some of the ways you can make an impact without writing a single line of code:' ); ?></p>
<ul>
<li><?php _e( '<strong>Share</strong> your knowledge in the WordPress support forums.' ); ?></li>
<li><?php _e( '<strong>Write</strong> or improve documentation for WordPress.' ); ?></li>
<li><?php _e( '<strong>Translate</strong> WordPress into your local language.' ); ?></li>
<li><?php _e( '<strong>Create</strong> and improve WordPress educational materials.' ); ?></li>
<li><?php _e( '<strong>Promote</strong> the WordPress project to your community.' ); ?></li>
<li><?php _e( '<strong>Curate</strong> submissions or take photos for the WordPress Photos Directory.' ); ?></li>
<li><?php _e( '<strong>Organize</strong> or participate in local WordPress Meetups and WordCamps.' ); ?></li>
<li><?php _e( '<strong>Lend</strong> your creative imagination to the WordPress UI design.' ); ?></li>
<li><?php _e( '<strong>Edit</strong> videos and add captions to WordPress.tv.' ); ?></li>
<li><?php _e( '<strong>Explore</strong> ways to reduce the environmental impact of millions of websites.' ); ?></li>
</ul>
</div>
<div class="column">
<img src="<?php echo esc_url( admin_url( 'images/contribute-no-code.svg?ver=6.3' ) ); ?>" alt="" />
</div>
</div>
<div class="about__section has-2-columns is-wider-right">
<div class="column">
<img src="<?php echo esc_url( admin_url( 'images/contribute-code.svg?ver=6.3' ) ); ?>" alt="" />
</div>
<div class="column is-vertically-aligned-center">
<h3><?php _e( 'Code-based contribution' ); ?></h3>
<p><?php _e( 'If you do code, or want to learn how, you can contribute technically in numerous ways:' ); ?></p>
<ul>
<li><?php _e( '<strong>Find</strong> and report bugs in the WordPress core software.' ); ?></li>
<li><?php _e( '<strong>Test</strong> new releases and proposed features for the block editor.' ); ?></li>
<li><?php _e( '<strong>Write</strong> and submit patches to fix bugs or help build new features.' ); ?></li>
<li><?php _e( '<strong>Contribute</strong> to the code, improve the UX, and test the WordPress app.' ); ?></li>
</ul>
<p><?php _e( 'WordPress embraces new technologies, while being committed to backward compatibility. The WordPress project uses the following languages and libraries:' ); ?></p>
<ul>
<li><?php _e( 'Core and Block Editor: HTML, CSS, PHP, SQL, JavaScript, and React' ); ?></li>
<li><?php _e( 'WordPress app: Kotlin, Java, Swift, Objective-C, Vue, Python, and TypeScript' ); ?></li>
</ul>
</div>
</div>

<div class="about__section is-feature has-subtle-background-color">
<div class="column">
<h2><?php _e( 'Shape the future of the web with WordPress' ); ?></h2>
<p><?php _e( 'Finding the area that aligns with your skills and interests is the first step toward meaningful contribution. With more than 20 Make WordPress teams working on different parts of the open source WordPress project, there&#8217;s a place for everyone, no matter what your skill set is.' ); ?></p>
<p class="aligncenter"><a href="<?php echo esc_url( __( 'https://make.wordpress.org/contribute/' ) ); ?>"><?php _e( 'Find your team &rarr;' ); ?></a></p>
</div>
</div>

</div>
<?php
require_once ABSPATH . 'wp-admin/admin-footer.php';
5 changes: 3 additions & 2 deletions wp/wp-admin/credits.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
<a href="credits.php" class="nav-tab nav-tab-active" aria-current="page"><?php _e( 'Credits' ); ?></a>
<a href="freedoms.php" class="nav-tab"><?php _e( 'Freedoms' ); ?></a>
<a href="privacy.php" class="nav-tab"><?php _e( 'Privacy' ); ?></a>
<a href="contribute.php" class="nav-tab"><?php _e( 'Get Involved' ); ?></a>
</nav>

<div class="about__section has-1-column has-gutters">
Expand All @@ -59,15 +60,15 @@
);
?>
<br />
<a href="https://make.wordpress.org/"><?php _e( 'Get involved in WordPress.' ); ?></a>
<a href="<?php echo esc_url( __( 'https://make.wordpress.org/contribute/' ) ); ?>"><?php _e( 'Get involved in WordPress.' ); ?></a>
</p>

<?php else : ?>

<p>
<?php _e( 'Want to see your name in lights on this page?' ); ?>
<br />
<a href="https://make.wordpress.org/"><?php _e( 'Get involved in WordPress.' ); ?></a>
<a href="<?php echo esc_url( __( 'https://make.wordpress.org/contribute/' ) ); ?>"><?php _e( 'Get involved in WordPress.' ); ?></a>
</p>

<?php endif; ?>
Expand Down

0 comments on commit e5cb80e

Please sign in to comment.