Skip to content
Permalink
Browse files

Merge branch 'release/1.0.0-beta2'

  • Loading branch information...
nylen committed Dec 18, 2018
2 parents bacbdaf + bd3b1cc commit 615412efcd36db05785fafbb03683a01c03497ad
Showing with 978 additions and 308 deletions.
  1. +3 −3 readme.html
  2. +77 −35 wp-activate.php
  3. +10 −0 wp-admin/about.php
  4. +1 −1 wp-admin/comment.php
  5. +118 −5 wp-admin/css/dashboard-rtl.css
  6. +1 −1 wp-admin/css/dashboard-rtl.min.css
  7. +118 −5 wp-admin/css/dashboard.css
  8. +1 −1 wp-admin/css/dashboard.min.css
  9. +1 −1 wp-admin/custom-background.php
  10. +1 −1 wp-admin/custom-header.php
  11. +1 −1 wp-admin/edit-comments.php
  12. +3 −3 wp-admin/edit-form-advanced.php
  13. +2 −2 wp-admin/edit-link-form.php
  14. +1 −1 wp-admin/edit-tags.php
  15. +2 −2 wp-admin/edit.php
  16. +1 −1 wp-admin/export.php
  17. +1 −1 wp-admin/import.php
  18. +8 −1 wp-admin/includes/ajax-actions.php
  19. +6 −6 wp-admin/includes/class-core-upgrader.php
  20. +1 −1 wp-admin/includes/class-wp-automatic-updater.php
  21. +3 −1 wp-admin/includes/class-wp-screen.php
  22. +153 −47 wp-admin/includes/dashboard.php
  23. +1 −1 wp-admin/includes/misc.php
  24. +8 −6 wp-admin/includes/plugin-install.php
  25. +35 −13 wp-admin/includes/post.php
  26. +8 −6 wp-admin/includes/theme.php
  27. +26 −17 wp-admin/includes/translation-install.php
  28. +18 −2 wp-admin/includes/update-core.php
  29. +5 −3 wp-admin/includes/update.php
  30. +5 −12 wp-admin/index.php
  31. +18 −2 wp-admin/js/dashboard.js
  32. +1 −1 wp-admin/js/dashboard.min.js
  33. +1 −1 wp-admin/link-manager.php
  34. +0 −13 wp-admin/load-scripts.php
  35. +0 −13 wp-admin/load-styles.php
  36. +1 −1 wp-admin/media-new.php
  37. +1 −1 wp-admin/media.php
  38. +1 −1 wp-admin/my-sites.php
  39. +1 −1 wp-admin/nav-menus.php
  40. +1 −1 wp-admin/network.php
  41. +1 −1 wp-admin/network/settings.php
  42. +1 −1 wp-admin/network/themes.php
  43. +1 −1 wp-admin/network/upgrade.php
  44. +1 −1 wp-admin/options-discussion.php
  45. +1 −1 wp-admin/options-general.php
  46. +1 −1 wp-admin/options-media.php
  47. +1 −1 wp-admin/options-permalink.php
  48. +1 −1 wp-admin/options-reading.php
  49. +1 −1 wp-admin/options-writing.php
  50. +1 −1 wp-admin/plugin-editor.php
  51. +1 −1 wp-admin/plugin-install.php
  52. +1 −1 wp-admin/plugins.php
  53. +8 −2 wp-admin/post.php
  54. +1 −1 wp-admin/revision.php
  55. +1 −1 wp-admin/theme-editor.php
  56. +2 −2 wp-admin/theme-install.php
  57. +1 −1 wp-admin/themes.php
  58. +1 −1 wp-admin/tools.php
  59. +32 −6 wp-admin/update-core.php
  60. +2 −2 wp-admin/upload.php
  61. +1 −1 wp-admin/user-edit.php
  62. +1 −1 wp-admin/user-new.php
  63. +1 −1 wp-admin/users.php
  64. +1 −1 wp-admin/widgets.php
  65. +3 −1 wp-includes/class-wp-image-editor.php
  66. +2 −2 wp-includes/class-wp-term-query.php
  67. +2 −0 wp-includes/class-wp.php
  68. +3 −0 wp-includes/class.wp-scripts.php
  69. +3 −0 wp-includes/class.wp-styles.php
  70. +1 −1 wp-includes/customize/class-wp-customize-themes-section.php
  71. +1 −1 wp-includes/embed.php
  72. +6 −4 wp-includes/formatting.php
  73. +42 −7 wp-includes/functions.php
  74. +34 −7 wp-includes/general-template.php
  75. +5 −0 wp-includes/js/wp-embed.js
  76. +1 −1 wp-includes/js/wp-embed.min.js
  77. +76 −13 wp-includes/kses.php
  78. +6 −1 wp-includes/load.php
  79. +10 −5 wp-includes/ms-deprecated.php
  80. +1 −1 wp-includes/pomo/plural-forms.php
  81. +1 −1 wp-includes/post.php
  82. +1 −1 wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php
  83. +37 −2 wp-includes/script-loader.php
  84. +10 −6 wp-includes/update.php
  85. +20 −2 wp-includes/version.php
  86. +3 −3 wp-includes/wp-db.php
  87. +2 −2 wp-login.php
@@ -26,7 +26,7 @@ <h2>Installation: Famous 5-minute install</h2>
<li>Open <span class="file"><a href="wp-admin/install.php">wp-admin/install.php</a></span> in your browser.</li>
</ol>
</li>
<li>Once the configuration file is set up, the installer will set up the tables needed for your blog. If there is an error, double check your <code>wp-config.php</code> file, and try again. If it fails again, please go to the <a href="https://wordpress.org/support/" title="WordPress support">support forums</a> with as much data as you can gather.</li>
<li>Once the configuration file is set up, the installer will set up the tables needed for your blog. If there is an error, double check your <code>wp-config.php</code> file, and try again. If it fails again, please go to the <a href="https://forums.classicpress.net/c/support" title="ClassicPress support">support forums</a> with as much data as you can gather.</li>
<li><strong>If you did not enter a password, note the password given to you.</strong> If you did not provide a username, it will be <code>admin</code>.</li>
<li>The installer should then send you to the <a href="wp-login.php">login page</a>. Sign in with the username and password you chose during the installation. If a password was generated for you, you can then click on &#8220;Profile&#8221; to change the password.</li>
</ol>
@@ -74,15 +74,15 @@ <h2>Online Resources</h2>
<dd>This is where you&#8217;ll find the latest updates and news related to WordPress. Recent WordPress news appears in your administrative dashboard by default.</dd>
<dt><a href="https://planet.wordpress.org/">WordPress Planet</a></dt>
<dd>The WordPress Planet is a news aggregator that brings together posts from WordPress blogs around the web.</dd>
<dt><a href="https://wordpress.org/support/">WordPress Support Forums</a></dt>
<dt><a href="https://forums.classicpress.net/c/support">ClassicPress support Forums</a></dt>
<dd>If you&#8217;ve looked everywhere and still can&#8217;t find an answer, the support forums are very active and have a large community ready to help. To help them help you be sure to use a descriptive thread title and describe your question in as much detail as possible.</dd>
<dt><a href="https://codex.wordpress.org/IRC">WordPress <abbr title="Internet Relay Chat">IRC</abbr> Channel</a></dt>
<dd>There is an online chat channel that is used for discussion among people who use WordPress and occasionally support topics. The above wiki page should point you in the right direction. (<a href="irc://irc.freenode.net/wordpress">irc.freenode.net #wordpress</a>)</dd>
</dl>

<h2>Final Notes</h2>
<ul>
<li>If you have any suggestions, ideas, or comments, or if you (gasp!) found a bug, join us in the <a href="https://wordpress.org/support/">Support Forums</a>.</li>
<li>If you have any suggestions, ideas, or comments, or if you (gasp!) found a bug, join us in the <a href="https://forums.classicpress.net/c/support">Support Forums</a>.</li>
<li>WordPress has a robust plugin <abbr title="application programming interface">API</abbr> that makes extending the code easy. If you are a developer interested in utilizing this, see the <a href="https://developer.wordpress.org/plugins/">Plugin Developer Handbook</a>. You shouldn&#8217;t modify any of the core code.</li>
</ul>

@@ -18,6 +18,50 @@
die();
}
$valid_error_codes = array( 'already_active', 'blog_taken' );
list( $activate_path ) = explode( '?', wp_unslash( $_SERVER['REQUEST_URI'] ) );
$activate_cookie = 'wp-activate-' . COOKIEHASH;
$key = '';
$result = null;
if ( isset( $_GET['key'] ) && isset( $_POST['key'] ) && $_GET['key'] !== $_POST['key'] ) {
wp_die( __( 'A key value mismatch has been detected. Please follow the link provided in your activation email.' ), __( 'An error occurred during the activation' ), 400 );
} elseif ( ! empty( $_GET['key'] ) ) {
$key = $_GET['key'];
} elseif ( ! empty( $_POST['key'] ) ) {
$key = $_POST['key'];
}
if ( $key ) {
$redirect_url = remove_query_arg( 'key' );
if ( $redirect_url !== remove_query_arg( false ) ) {
setcookie( $activate_cookie, $key, 0, $activate_path, COOKIE_DOMAIN, is_ssl(), true );
wp_safe_redirect( $redirect_url );
exit;
} else {
$result = wpmu_activate_signup( $key );
}
}
if ( $result === null && isset( $_COOKIE[ $activate_cookie ] ) ) {
$key = $_COOKIE[ $activate_cookie ];
$result = wpmu_activate_signup( $key );
setcookie( $activate_cookie, ' ', time() - YEAR_IN_SECONDS, $activate_path, COOKIE_DOMAIN, is_ssl(), true );
}
if ( $result === null || ( is_wp_error( $result ) && 'invalid_key' === $result->get_error_code() ) ) {
status_header( 404 );
} elseif ( is_wp_error( $result ) ) {
$error_code = $result->get_error_code();
if ( ! in_array( $error_code, $valid_error_codes ) ) {
status_header( 400 );
}
}
nocache_headers();
if ( is_object( $wp_object_cache ) )
@@ -69,13 +113,14 @@ function wpmu_activate_stylesheet() {
<?php
}
add_action( 'wp_head', 'wpmu_activate_stylesheet' );
add_action( 'wp_head', 'wp_sensitive_page_meta' );
get_header( 'wp-activate' );
?>

<div id="signup-content" class="widecolumn">
<div class="wp-activate-container">
<?php if ( empty($_GET['key']) && empty($_POST['key']) ) { ?>
<?php if ( ! $key ) { ?>

<h2><?php _e('Activation Key Required') ?></h2>
<form name="activateform" id="activateform" method="post" action="<?php echo network_site_url('wp-activate.php'); ?>">
@@ -89,42 +134,39 @@ function wpmu_activate_stylesheet() {
</form>

<?php } else {
$key = !empty($_GET['key']) ? $_GET['key'] : $_POST['key'];
$result = wpmu_activate_signup( $key );
if ( is_wp_error($result) ) {
if ( 'already_active' == $result->get_error_code() || 'blog_taken' == $result->get_error_code() ) {
$signup = $result->get_error_data();
?>
<h2><?php _e('Your account is now active!'); ?></h2>
<?php
echo '<p class="lead-in">';
if ( $signup->domain . $signup->path == '' ) {
printf(
/* translators: 1: login URL, 2: username, 3: user email, 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( 'wp-login.php', 'login' ),
$signup->user_login,
$signup->user_email,
wp_lostpassword_url()
);
} else {
printf(
/* translators: 1: site URL, 2: username, 3: user email, 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">%1$s</a>', $signup->domain ),
$signup->user_login,
$signup->user_email,
wp_lostpassword_url()
);
}
echo '</p>';
if ( is_wp_error( $result ) && in_array( $result->get_error_code(), $valid_error_codes ) ) {
$signup = $result->get_error_data();
?>
<h2><?php _e( 'Your account is now active!' ); ?></h2>
<?php
echo '<p class="lead-in">';
if ( $signup->domain . $signup->path == '' ) {
printf(
/* translators: 1: login URL, 2: username, 3: user email, 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( 'wp-login.php', 'login' ),
$signup->user_login,
$signup->user_email,
wp_lostpassword_url()
);
} else {
?>
<h2><?php _e( 'An error occurred during the activation' ); ?></h2>
<p><?php echo $result->get_error_message(); ?></p>
<?php
printf(
/* translators: 1: site URL, 2: username, 3: user email, 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">%1$s</a>', $signup->domain ),
$signup->user_login,
$signup->user_email,
wp_lostpassword_url()
);
}
echo '</p>';
} elseif ( $result === null || 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>
<?php endif; ?>
<?php
} else {
$url = isset( $result['blog_id'] ) ? get_home_url( (int) $result['blog_id'] ) : '';
$user = get_userdata( (int) $result['user_id'] );
@@ -55,6 +55,16 @@
?>

<h3><?php _e( 'WordPress Maintenance and Security Releases' ); ?></h3>
<p>
<?php
/* translators: %s: WordPress version number */
printf( __( '<strong>Version %s</strong> addressed some security issues.' ), '4.9.9' );
?>
<?php
/* translators: %s: Codex URL */
printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_4.9.9' );
?>
</p>
<p>
<?php
printf(
@@ -49,7 +49,7 @@
get_current_screen()->set_help_sidebar(
'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
'<p>' . __( '<a href="https://codex.wordpress.org/Administration_Screens#Comments">Documentation on Comments</a>' ) . '</p>' .
'<p>' . __( '<a href="https://wordpress.org/support/">Support Forums</a>' ) . '</p>'
'<p>' . __( '<a href="https://forums.classicpress.net/c/support">Support Forums</a>' ) . '</p>'
);
wp_enqueue_script('comment');
@@ -203,7 +203,7 @@
}

.welcome-panel .welcome-panel-column ul {
margin: 0.8em 0 1em 1em;
margin: 0.8em 0 1em 1em;
}

.welcome-panel .welcome-panel-column li {
@@ -358,7 +358,6 @@
}

.community-events .activity-block > p {
margin-bottom: 0;
display: inline;
}

@@ -1117,6 +1116,123 @@ a.rsswidget {
font-size: 16px;
}

/* ---------------------------------------------------------
Dashboard Petitions Widget
------------------------------------------------------------*/
#dashboard_petitions .postbox .inside {
margin: 0;
padding: 0;
}

#dashboard_petitions .sub {
background: #f5f5f5;
padding: 10px 12px 6px;
}

/* Link to the petitions website */
.cp_petitions_link {
margin: 1rem 0;
}

.petitions-tabs {
float: right;
width: 100%;
margin: 0;
list-style-type: none;
border-bottom: 1px solid #e7e7e7;
margin-top: 16px;
}

.petitions-tabs > li {
float: right;
margin-bottom: -1px;
}

.petitions-tabs > li > a {
margin-left: 2px;
line-height: 1.5;
padding: 10px;
border: 1px solid transparent;
float: right;
text-decoration: none;
}

.petitions-tabs > li > a:hover {
background-color: #f2f2f2;
}

.petitions-tabs > li.active > a,
.petitions-tabs > li.active > a:hover,
.petitions-tabs > li.active > a:focus {
color: #555;
cursor: default;
background-color: #f2f2f2;
border-color: #f2f2f2;
}

.petitions-content {
display: table;
}

.petitions-content > .petitions-pane {
float: right;
width: 100%;
display: none;
}

.petitions-content > .petitions-pane.active {
display: block;
}

/* Petitions list */
table.cp_petitions {
width: 100%;
padding: 0;
border-spacing: 0;
}
table.cp_petitions thead {
background-color: #f7f7f7;
}

table.cp_petitions tbody tr:nth-child(even) {
background: #f7f7f7;
}

table.cp_petitions .votes-count {
font-size: 14px;
}

table.cp_petitions .petition {
text-align: right;
font-weight: normal;
}

table.cp_petitions thead {
font-weight: 700;
}

table.cp_petitions td {
padding: 8px;
}

table.cp_petitions td:nth-child(1) {
text-align: center;
}

table.cp_petitions span.planned {
/* display: inline; */
background: #89288f; /* 61ce70 is the classic green but a pain to read */
color: #fff;
padding: 2px 4px;
}

table.cp_petitions span.started {
/* display: inline; */
background: #1da21d;
color: #fff;
padding: 2px 4px;
}

/* =Media Queries
-------------------------------------------------------------- */

@@ -1208,9 +1324,6 @@ a.rsswidget {
}
}

@media screen and (max-width: 1024px) {
}

@media screen and (max-width: 870px) {
.welcome-panel .welcome-panel-column,
.welcome-panel .welcome-panel-column:first-child {

Large diffs are not rendered by default.

0 comments on commit 615412e

Please sign in to comment.
You can’t perform that action at this time.