Skip to content

Commit

Permalink
Update to WordPress 4.5. For more information, see https://wordpress.…
Browse files Browse the repository at this point in the history
  • Loading branch information
Pantheon Automation authored and greg-1-anderson committed Apr 12, 2016
1 parent 5853a45 commit d632edc
Show file tree
Hide file tree
Showing 564 changed files with 23,559 additions and 9,391 deletions.
2 changes: 1 addition & 1 deletion license.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
WordPress - Web publishing software

Copyright 2016 by the contributors
Copyright 2011-2016 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
2 changes: 1 addition & 1 deletion readme.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<body>
<h1 id="logo">
<a href="https://wordpress.org/"><img alt="WordPress" src="wp-admin/images/wordpress-logo.png" /></a>
<br /> Version 4.4.2
<br /> Version 4.5
</h1>
<p style="text-align: center">Semantic Personal Publishing Platform</p>

Expand Down
8 changes: 4 additions & 4 deletions wp-activate.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/**
* Confirms that the activation key that is sent in an email after a user signs
* up for a new blog matches the key for that user and then displays confirmation.
* up for a new site matches the key for that user and then displays confirmation.
*
* @package WordPress
*/
Expand Down Expand Up @@ -117,9 +117,9 @@ function wpmu_activate_stylesheet() {
</div>

<?php if ( $url && $url != network_home_url( '', 'http' ) ) :
switch_to_blog( (int) $result['blog_id'] );
$login_url = wp_login_url();
restore_current_blog();
switch_to_blog( (int) $result['blog_id'] );
$login_url = wp_login_url();
restore_current_blog();
?>
<p class="view"><?php 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 ) ); ?></p>
<?php else: ?>
Expand Down
208 changes: 91 additions & 117 deletions wp-admin/about.php

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion wp-admin/admin-ajax.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
/** Load WordPress Bootstrap */
require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );

/** Allow for cross-domain requests (from the frontend). */
/** Allow for cross-domain requests (from the front end). */
send_origin_headers();

// Require an action parameter
Expand Down
2 changes: 1 addition & 1 deletion wp-admin/admin-post.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
else
require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );

/** Allow for cross-domain requests (from the frontend). */
/** Allow for cross-domain requests (from the front end). */
send_origin_headers();

require_once(ABSPATH . 'wp-admin/includes/admin.php');
Expand Down
14 changes: 8 additions & 6 deletions wp-admin/admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
*
* @since 3.0.0
*
* @param bool true Whether to perform the Multisite upgrade routine. Default true.
* @param bool $do_mu_upgrade Whether to perform the Multisite upgrade routine. Default true.
*/
} elseif ( apply_filters( 'do_mu_upgrade', true ) ) {
$c = get_blog_count();
Expand Down Expand Up @@ -89,8 +89,8 @@

set_screen_options();

$date_format = get_option('date_format');
$time_format = get_option('time_format');
$date_format = __( 'F j, Y' );
$time_format = __( 'g:i a' );

wp_enqueue_script( 'common' );

Expand Down Expand Up @@ -146,7 +146,7 @@
* handled separately.
*
* The WP_MAX_MEMORY_LIMIT constant specifically defines the maximum memory limit available
* when in the administration back-end. The default is 256M, or 256 megabytes of memory.
* when in the administration back end. The default is 256M, or 256 megabytes of memory.
*
* @since 3.0.0
*
Expand All @@ -161,7 +161,7 @@
* Note, this does not just run on user-facing admin screens.
* It runs on admin-ajax.php and admin-post.php as well.
*
* This is roughly analgous to the more general 'init' hook, which fires earlier.
* This is roughly analogous to the more general 'init' hook, which fires earlier.
*
* @since 2.5.0
*/
Expand Down Expand Up @@ -312,7 +312,7 @@
*
* @since 3.1.0
*
* @param bool false Whether to force data to be filtered through kses. Default false.
* @param bool $force Whether to force data to be filtered through kses. Default false.
*/
if ( apply_filters( 'force_filtered_html_on_import', false ) ) {
kses_init_filters(); // Always filter imported data with kses on multisite.
Expand Down Expand Up @@ -355,6 +355,8 @@
do_action( 'load-categories.php' );
elseif ( $taxnow == 'link_category' )
do_action( 'load-edit-link-categories.php' );
} elseif( 'term.php' === $pagenow ) {
do_action( 'load-edit-tags.php' );
}
}

Expand Down
44 changes: 26 additions & 18 deletions wp-admin/comment.php
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@

$comment_id = absint( $_GET['c'] );

if ( !$comment = get_comment_to_edit( $comment_id ) ) {
if ( ! $comment = get_comment( $comment_id ) ) {
wp_redirect( admin_url('edit-comments.php?error=1') );
die();
}
Expand Down Expand Up @@ -142,27 +142,27 @@
break;
}
if ( $message ) {
echo '<div class="notice notice-info"><p>' . $message . '</p></div>';
echo '<div id="message" class="notice notice-info"><p>' . $message . '</p></div>';
}
}
?>
<p><strong><?php _e('Caution:'); ?></strong> <?php echo $caution_msg; ?></p>
<div id="message" class="notice notice-warning"><p><strong><?php _e( 'Caution:' ); ?></strong> <?php echo $caution_msg; ?></p></div>

<table class="form-table comment-ays">
<tr>
<th scope="row"><?php _e('Author'); ?></th>
<td><?php echo $comment->comment_author; ?></td>
<td><?php comment_author( $comment ); ?></td>
</tr>
<?php if ( $comment->comment_author_email ) { ?>
<?php if ( get_comment_author_email( $comment ) ) { ?>
<tr>
<th scope="row"><?php _e('Email'); ?></th>
<td><?php echo $comment->comment_author_email; ?></td>
<td><?php comment_author_email( $comment ); ?></td>
</tr>
<?php } ?>
<?php if ( $comment->comment_author_url ) { ?>
<?php if ( get_comment_author_url( $comment ) ) { ?>
<tr>
<th scope="row"><?php _e('URL'); ?></th>
<td><a href="<?php echo $comment->comment_author_url; ?>"><?php echo $comment->comment_author_url; ?></a></td>
<td><a href="<?php comment_author_url( $comment ); ?>"><?php comment_author_url( $comment ); ?></a></td>
</tr>
<?php } ?>
<tr>
Expand Down Expand Up @@ -194,27 +194,35 @@
<tr>
<th scope="row"><?php _e( 'Submitted on' ); ?></th>
<td>
<a href="<?php echo esc_url( get_comment_link( $comment ) ); ?>"><?php
/* translators: 1: comment date, 2: comment time */
printf( __( '%1$s at %2$s' ),
/* translators: comment date format. See http://php.net/date */
get_comment_date( __( 'Y/m/d' ), $comment ),
get_comment_date( get_option( 'time_format' ), $comment )
);
?></a>
<?php
/* translators: 1: comment date, 2: comment time */
$submitted = sprintf( __( '%1$s at %2$s' ),
/* translators: comment date format. See http://php.net/date */
get_comment_date( __( 'Y/m/d' ), $comment ),
get_comment_date( __( 'g:i a' ), $comment )
);
if ( 'approved' === wp_get_comment_status( $comment ) && ! empty ( $comment->comment_post_ID ) ) {
echo '<a href="' . esc_url( get_comment_link( $comment ) ) . '">' . $submitted . '</a>';
} else {
echo $submitted;
}
?>
</td>
</tr>
<tr>
<th scope="row"><?php /* translators: field name in comment form */ _ex('Comment', 'noun'); ?></th>
<td><?php echo $comment->comment_content; ?></td>
<td class="comment-content">
<?php comment_text( $comment ); ?>
<p class="edit-comment"><a href="<?php echo admin_url( "comment.php?action=editcomment&amp;c={$comment->comment_ID}" ); ?>"><?php esc_attr_e( 'Edit' ); ?></a></p>
</td>
</tr>
</table>

<form action="comment.php" method="get" class="comment-ays-submit">

<p>
<?php submit_button( $button, 'primary', 'submit', false ); ?>
<a href="<?php echo admin_url('edit-comments.php'); ?>" class="button-cancel"><?php esc_attr_e( 'Cancel' ); ?></a></td>
<a href="<?php echo admin_url('edit-comments.php'); ?>" class="button-cancel"><?php esc_attr_e( 'Cancel' ); ?></a>
</p>

<?php wp_nonce_field( $nonce_action ); ?>
Expand Down
42 changes: 19 additions & 23 deletions wp-admin/credits.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@

<h1><?php printf( __( 'Welcome to WordPress %s' ), $display_version ); ?></h1>

<div class="about-text"><?php printf( __( 'Thank you for updating! WordPress %s makes your site more connected and responsive.' ), $display_version ); ?></div>
<div class="about-text"><?php printf( __( 'Thank you for updating! WordPress %s streamlines your workflow, whether you&#8217;re writing or building your site.' ), $display_version ); ?></div>

<div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>

<h2 class="nav-tab-wrapper">
<h2 class="nav-tab-wrapper wp-clearfix">
<a href="about.php" class="nav-tab"><?php _e( 'What&#8217;s New' ); ?></a>
<a href="credits.php" class="nav-tab nav-tab-active"><?php _e( 'Credits' ); ?></a>
<a href="freedoms.php" class="nav-tab"><?php _e( 'Freedoms' ); ?></a>
Expand All @@ -35,10 +35,13 @@
$credits = wp_credits();

if ( ! $credits ) {
echo '<p class="about-description">' . sprintf( __( 'WordPress is created by a <a href="%1$s">worldwide team</a> of passionate individuals. <a href="%2$s">Get involved in WordPress</a>.' ),
echo '<p class="about-description">';
/* translators: 1: https://wordpress.org/about/, 2: https://make.wordpress.org/ */
printf( __( 'WordPress is created by a <a href="%1$s">worldwide team</a> of passionate individuals. <a href="%2$s">Get involved in WordPress</a>.' ),
'https://wordpress.org/about/',
/* translators: Url to the codex documentation on contributing to WordPress used on the credits page */
__( 'https://codex.wordpress.org/Contributing_to_WordPress' ) ) . '</p>';
__( 'https://make.wordpress.org/' )
);
echo '</p>';
include( ABSPATH . 'wp-admin/admin-footer.php' );
exit;
}
Expand Down Expand Up @@ -77,13 +80,13 @@
echo '<ul class="' . $classes . '" id="wp-people-group-' . $group_slug . '">' . "\n";
foreach ( $group_data['data'] as $person_data ) {
echo '<li class="wp-person" id="wp-person-' . esc_attr( $person_data[2] ) . '">' . "\n\t";
echo '<a href="' . esc_url( sprintf( $credits['data']['profiles'], $person_data[2] ) ) . '">';
echo '<a href="' . esc_url( sprintf( $credits['data']['profiles'], $person_data[2] ) ) . '" class="web">';
$size = 'compact' == $group_data['type'] ? 30 : 60;
$data = get_avatar_data( $person_data[1] . '@md5.gravatar.com', array( 'size' => $size ) );
$size *= 2;
$data2x = get_avatar_data( $person_data[1] . '@md5.gravatar.com', array( 'size' => $size ) );
echo '<img src="' . esc_url( $data['url'] ) . '" srcset="' . esc_url( $data2x['url'] ) . ' 2x" class="gravatar" alt="' . esc_attr( $person_data[0] ) . '" /></a>' . "\n\t";
echo '<a class="web" href="' . esc_url( sprintf( $credits['data']['profiles'], $person_data[2] ) ) . '">' . esc_html( $person_data[0] ) . "</a>\n\t";
echo '<img src="' . esc_url( $data['url'] ) . '" srcset="' . esc_url( $data2x['url'] ) . ' 2x" class="gravatar" alt="" />' . "\n";
echo esc_html( $person_data[0] ) . "</a>\n\t";
if ( ! $compact )
echo '<span class="title">' . translate( $person_data[3] ) . "</span>\n";
echo "</li>\n";
Expand All @@ -94,9 +97,12 @@
}

?>
<p class="clear"><?php printf( __( 'Want to see your name in lights on this page? <a href="%s">Get involved in WordPress</a>.' ),
/* translators: URL to the Make WordPress 'Get Involved' landing page used on the credits page */
__( 'https://make.wordpress.org/' ) ); ?></p>
<p class="clear"><?php
/* translators: %s: https://make.wordpress.org/ */
printf( __( 'Want to see your name in lights on this page? <a href="%s">Get involved in WordPress</a>.' ),
__( 'https://make.wordpress.org/' )
);
?></p>

</div>
<?php
Expand All @@ -107,22 +113,12 @@

// These are strings returned by the API that we want to be translatable
__( 'Project Leaders' );
__( 'Extended Core Team' );
__( 'Core Developers' );
__( 'Recent Rockstars' );
__( 'Core Contributors to WordPress %s' );
__( 'Contributing Developers' );
__( 'Cofounder, Project Lead' );
__( 'Lead Developer' );
__( 'Release Lead' );
__( 'User Experience Lead' );
__( 'Release Design Lead' );
__( 'Release Deputy' );
__( 'Core Developer' );
__( 'Core Committer' );
__( 'Guest Committer' );
__( 'Developer' );
__( 'Designer' );
__( 'Docs Committer' );
__( 'XML-RPC' );
__( 'Internationalization' );
__( 'External Libraries' );
__( 'Icon Design' );
Loading

0 comments on commit d632edc

Please sign in to comment.