Skip to content

Commit 2273be0

Browse files
committed
New Site Files
1 parent 0a15885 commit 2273be0

File tree

748 files changed

+42884
-9584
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

748 files changed

+42884
-9584
lines changed

.htaccess

Lines changed: 10 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,13 @@
1-
# BEGIN W3TC Browser Cache
2-
<IfModule mod_deflate.c>
3-
<IfModule mod_headers.c>
4-
Header append Vary User-Agent env=!dont-vary
5-
</IfModule>
6-
<IfModule mod_filter.c>
7-
AddOutputFilterByType DEFLATE text/css text/x-component application/x-javascript application/javascript text/javascript text/x-js text/html text/richtext image/svg+xml text/plain text/xsd text/xsl text/xml image/x-icon application/json
8-
<IfModule mod_mime.c>
9-
# DEFLATE by extension
10-
AddOutputFilter DEFLATE js css htm html xml
11-
</IfModule>
12-
</IfModule>
13-
</IfModule>
14-
# END W3TC Browser Cache
15-
# BEGIN W3TC Page Cache core
16-
<IfModule mod_rewrite.c>
17-
RewriteEngine On
18-
RewriteBase /Spectrum/
19-
RewriteCond %{HTTP:Accept-Encoding} gzip
20-
RewriteRule .* - [E=W3TC_ENC:_gzip]
21-
RewriteCond %{HTTP_COOKIE} w3tc_preview [NC]
22-
RewriteRule .* - [E=W3TC_PREVIEW:_preview]
23-
RewriteCond %{REQUEST_METHOD} !=POST
24-
RewriteCond %{QUERY_STRING} =""
25-
RewriteCond %{REQUEST_URI} \/$
26-
RewriteCond %{HTTP_COOKIE} !(comment_author|wp\-postpass|w3tc_logged_out|wordpress_logged_in|wptouch_switch_toggle) [NC]
27-
RewriteCond "%{DOCUMENT_ROOT}/Spectrum/wp-content/cache/page_enhanced/%{HTTP_HOST}/%{REQUEST_URI}/_index%{ENV:W3TC_PREVIEW}.html%{ENV:W3TC_ENC}" -f
28-
RewriteRule .* "/Spectrum/wp-content/cache/page_enhanced/%{HTTP_HOST}/%{REQUEST_URI}/_index%{ENV:W3TC_PREVIEW}.html%{ENV:W3TC_ENC}" [L]
29-
</IfModule>
30-
# END W3TC Page Cache core
31-
# BEGIN WordPress
32-
<IfModule mod_rewrite.c>
331
RewriteEngine On
34-
RewriteBase /Spectrum/
2+
RewriteBase /spectrum/
353
RewriteRule ^index\.php$ - [L]
36-
RewriteCond %{REQUEST_FILENAME} !-f
37-
RewriteCond %{REQUEST_FILENAME} !-d
38-
RewriteRule . /Spectrum/index.php [L]
39-
</IfModule>
404

41-
# END WordPress
5+
# add a trailing slash to /wp-admin
6+
RewriteRule ^([_0-9a-zA-Z-]+/)?wp-admin$ $1wp-admin/ [R=301,L]
7+
8+
RewriteCond %{REQUEST_FILENAME} -f [OR]
9+
RewriteCond %{REQUEST_FILENAME} -d
10+
RewriteRule ^ - [L]
11+
RewriteRule ^([_0-9a-zA-Z-]+/)?(wp-(content|admin|includes).*) $2 [L]
12+
RewriteRule ^([_0-9a-zA-Z-]+/)?(.*\.php)$ $2 [L]
13+
RewriteRule . index.php [L]

license.txt

Lines changed: 385 additions & 385 deletions
Large diffs are not rendered by default.

readme.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<body>
1010
<h1 id="logo">
1111
<a href="https://wordpress.org/"><img alt="WordPress" src="wp-admin/images/wordpress-logo.png" /></a>
12-
<br /> Version 4.4.2
12+
<br /> Version 4.5.2
1313
</h1>
1414
<p style="text-align: center">Semantic Personal Publishing Platform</p>
1515

wp-activate.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
33
* Confirms that the activation key that is sent in an email after a user signs
4-
* up for a new blog matches the key for that user and then displays confirmation.
4+
* up for a new site matches the key for that user and then displays confirmation.
55
*
66
* @package WordPress
77
*/
@@ -117,9 +117,9 @@ function wpmu_activate_stylesheet() {
117117
</div>
118118

119119
<?php if ( $url && $url != network_home_url( '', 'http' ) ) :
120-
switch_to_blog( (int) $result['blog_id'] );
121-
$login_url = wp_login_url();
122-
restore_current_blog();
120+
switch_to_blog( (int) $result['blog_id'] );
121+
$login_url = wp_login_url();
122+
restore_current_blog();
123123
?>
124124
<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>
125125
<?php else: ?>

wp-admin/about.php

Lines changed: 97 additions & 112 deletions
Large diffs are not rendered by default.

wp-admin/admin-ajax.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
/** Load WordPress Bootstrap */
2222
require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
2323

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

2727
// Require an action parameter

wp-admin/admin-post.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
else
1919
require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
2020

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

2424
require_once(ABSPATH . 'wp-admin/includes/admin.php');

wp-admin/admin.php

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
*
6060
* @since 3.0.0
6161
*
62-
* @param bool true Whether to perform the Multisite upgrade routine. Default true.
62+
* @param bool $do_mu_upgrade Whether to perform the Multisite upgrade routine. Default true.
6363
*/
6464
} elseif ( apply_filters( 'do_mu_upgrade', true ) ) {
6565
$c = get_blog_count();
@@ -89,8 +89,8 @@
8989

9090
set_screen_options();
9191

92-
$date_format = get_option('date_format');
93-
$time_format = get_option('time_format');
92+
$date_format = __( 'F j, Y' );
93+
$time_format = __( 'g:i a' );
9494

9595
wp_enqueue_script( 'common' );
9696

@@ -146,7 +146,7 @@
146146
* handled separately.
147147
*
148148
* The WP_MAX_MEMORY_LIMIT constant specifically defines the maximum memory limit available
149-
* when in the administration back-end. The default is 256M, or 256 megabytes of memory.
149+
* when in the administration back end. The default is 256M, or 256 megabytes of memory.
150150
*
151151
* @since 3.0.0
152152
*
@@ -161,7 +161,7 @@
161161
* Note, this does not just run on user-facing admin screens.
162162
* It runs on admin-ajax.php and admin-post.php as well.
163163
*
164-
* This is roughly analgous to the more general 'init' hook, which fires earlier.
164+
* This is roughly analogous to the more general 'init' hook, which fires earlier.
165165
*
166166
* @since 2.5.0
167167
*/
@@ -312,7 +312,7 @@
312312
*
313313
* @since 3.1.0
314314
*
315-
* @param bool false Whether to force data to be filtered through kses. Default false.
315+
* @param bool $force Whether to force data to be filtered through kses. Default false.
316316
*/
317317
if ( apply_filters( 'force_filtered_html_on_import', false ) ) {
318318
kses_init_filters(); // Always filter imported data with kses on multisite.
@@ -355,6 +355,8 @@
355355
do_action( 'load-categories.php' );
356356
elseif ( $taxnow == 'link_category' )
357357
do_action( 'load-edit-link-categories.php' );
358+
} elseif( 'term.php' === $pagenow ) {
359+
do_action( 'load-edit-tags.php' );
358360
}
359361
}
360362

wp-admin/comment.php

Lines changed: 26 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181

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

84-
if ( !$comment = get_comment_to_edit( $comment_id ) ) {
84+
if ( ! $comment = get_comment( $comment_id ) ) {
8585
wp_redirect( admin_url('edit-comments.php?error=1') );
8686
die();
8787
}
@@ -142,27 +142,27 @@
142142
break;
143143
}
144144
if ( $message ) {
145-
echo '<div class="notice notice-info"><p>' . $message . '</p></div>';
145+
echo '<div id="message" class="notice notice-info"><p>' . $message . '</p></div>';
146146
}
147147
}
148148
?>
149-
<p><strong><?php _e('Caution:'); ?></strong> <?php echo $caution_msg; ?></p>
149+
<div id="message" class="notice notice-warning"><p><strong><?php _e( 'Caution:' ); ?></strong> <?php echo $caution_msg; ?></p></div>
150150

151151
<table class="form-table comment-ays">
152152
<tr>
153153
<th scope="row"><?php _e('Author'); ?></th>
154-
<td><?php echo $comment->comment_author; ?></td>
154+
<td><?php comment_author( $comment ); ?></td>
155155
</tr>
156-
<?php if ( $comment->comment_author_email ) { ?>
156+
<?php if ( get_comment_author_email( $comment ) ) { ?>
157157
<tr>
158158
<th scope="row"><?php _e('Email'); ?></th>
159-
<td><?php echo $comment->comment_author_email; ?></td>
159+
<td><?php comment_author_email( $comment ); ?></td>
160160
</tr>
161161
<?php } ?>
162-
<?php if ( $comment->comment_author_url ) { ?>
162+
<?php if ( get_comment_author_url( $comment ) ) { ?>
163163
<tr>
164164
<th scope="row"><?php _e('URL'); ?></th>
165-
<td><a href="<?php echo $comment->comment_author_url; ?>"><?php echo $comment->comment_author_url; ?></a></td>
165+
<td><a href="<?php comment_author_url( $comment ); ?>"><?php comment_author_url( $comment ); ?></a></td>
166166
</tr>
167167
<?php } ?>
168168
<tr>
@@ -194,27 +194,35 @@
194194
<tr>
195195
<th scope="row"><?php _e( 'Submitted on' ); ?></th>
196196
<td>
197-
<a href="<?php echo esc_url( get_comment_link( $comment ) ); ?>"><?php
198-
/* translators: 1: comment date, 2: comment time */
199-
printf( __( '%1$s at %2$s' ),
200-
/* translators: comment date format. See http://php.net/date */
201-
get_comment_date( __( 'Y/m/d' ), $comment ),
202-
get_comment_date( get_option( 'time_format' ), $comment )
203-
);
204-
?></a>
197+
<?php
198+
/* translators: 1: comment date, 2: comment time */
199+
$submitted = sprintf( __( '%1$s at %2$s' ),
200+
/* translators: comment date format. See http://php.net/date */
201+
get_comment_date( __( 'Y/m/d' ), $comment ),
202+
get_comment_date( __( 'g:i a' ), $comment )
203+
);
204+
if ( 'approved' === wp_get_comment_status( $comment ) && ! empty ( $comment->comment_post_ID ) ) {
205+
echo '<a href="' . esc_url( get_comment_link( $comment ) ) . '">' . $submitted . '</a>';
206+
} else {
207+
echo $submitted;
208+
}
209+
?>
205210
</td>
206211
</tr>
207212
<tr>
208213
<th scope="row"><?php /* translators: field name in comment form */ _ex('Comment', 'noun'); ?></th>
209-
<td><?php echo $comment->comment_content; ?></td>
214+
<td class="comment-content">
215+
<?php comment_text( $comment ); ?>
216+
<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>
217+
</td>
210218
</tr>
211219
</table>
212220

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

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

220228
<?php wp_nonce_field( $nonce_action ); ?>

wp-admin/credits.php

Lines changed: 19 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020

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

23-
<div class="about-text"><?php printf( __( 'Thank you for updating! WordPress %s makes your site more connected and responsive.' ), $display_version ); ?></div>
23+
<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>
2424

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

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

3737
if ( ! $credits ) {
38-
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>.' ),
38+
echo '<p class="about-description">';
39+
/* translators: 1: https://wordpress.org/about/, 2: https://make.wordpress.org/ */
40+
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>.' ),
3941
'https://wordpress.org/about/',
40-
/* translators: Url to the codex documentation on contributing to WordPress used on the credits page */
41-
__( 'https://codex.wordpress.org/Contributing_to_WordPress' ) ) . '</p>';
42+
__( 'https://make.wordpress.org/' )
43+
);
44+
echo '</p>';
4245
include( ABSPATH . 'wp-admin/admin-footer.php' );
4346
exit;
4447
}
@@ -77,13 +80,13 @@
7780
echo '<ul class="' . $classes . '" id="wp-people-group-' . $group_slug . '">' . "\n";
7881
foreach ( $group_data['data'] as $person_data ) {
7982
echo '<li class="wp-person" id="wp-person-' . esc_attr( $person_data[2] ) . '">' . "\n\t";
80-
echo '<a href="' . esc_url( sprintf( $credits['data']['profiles'], $person_data[2] ) ) . '">';
83+
echo '<a href="' . esc_url( sprintf( $credits['data']['profiles'], $person_data[2] ) ) . '" class="web">';
8184
$size = 'compact' == $group_data['type'] ? 30 : 60;
8285
$data = get_avatar_data( $person_data[1] . '@md5.gravatar.com', array( 'size' => $size ) );
8386
$size *= 2;
8487
$data2x = get_avatar_data( $person_data[1] . '@md5.gravatar.com', array( 'size' => $size ) );
85-
echo '<img src="' . esc_url( $data['url'] ) . '" srcset="' . esc_url( $data2x['url'] ) . ' 2x" class="gravatar" alt="' . esc_attr( $person_data[0] ) . '" /></a>' . "\n\t";
86-
echo '<a class="web" href="' . esc_url( sprintf( $credits['data']['profiles'], $person_data[2] ) ) . '">' . esc_html( $person_data[0] ) . "</a>\n\t";
88+
echo '<img src="' . esc_url( $data['url'] ) . '" srcset="' . esc_url( $data2x['url'] ) . ' 2x" class="gravatar" alt="" />' . "\n";
89+
echo esc_html( $person_data[0] ) . "</a>\n\t";
8790
if ( ! $compact )
8891
echo '<span class="title">' . translate( $person_data[3] ) . "</span>\n";
8992
echo "</li>\n";
@@ -94,9 +97,12 @@
9497
}
9598

9699
?>
97-
<p class="clear"><?php printf( __( 'Want to see your name in lights on this page? <a href="%s">Get involved in WordPress</a>.' ),
98-
/* translators: URL to the Make WordPress 'Get Involved' landing page used on the credits page */
99-
__( 'https://make.wordpress.org/' ) ); ?></p>
100+
<p class="clear"><?php
101+
/* translators: %s: https://make.wordpress.org/ */
102+
printf( __( 'Want to see your name in lights on this page? <a href="%s">Get involved in WordPress</a>.' ),
103+
__( 'https://make.wordpress.org/' )
104+
);
105+
?></p>
100106

101107
</div>
102108
<?php
@@ -107,22 +113,12 @@
107113

108114
// These are strings returned by the API that we want to be translatable
109115
__( 'Project Leaders' );
110-
__( 'Extended Core Team' );
111-
__( 'Core Developers' );
112-
__( 'Recent Rockstars' );
113116
__( 'Core Contributors to WordPress %s' );
114117
__( 'Contributing Developers' );
115118
__( 'Cofounder, Project Lead' );
116119
__( 'Lead Developer' );
117120
__( 'Release Lead' );
118-
__( 'User Experience Lead' );
121+
__( 'Release Design Lead' );
122+
__( 'Release Deputy' );
119123
__( 'Core Developer' );
120-
__( 'Core Committer' );
121-
__( 'Guest Committer' );
122-
__( 'Developer' );
123-
__( 'Designer' );
124-
__( 'Docs Committer' );
125-
__( 'XML-RPC' );
126-
__( 'Internationalization' );
127124
__( 'External Libraries' );
128-
__( 'Icon Design' );

0 commit comments

Comments
 (0)