Commit c912100c authored by lechuck's avatar lechuck Committed by lucha

Upgraded wordpress to 4.3.1

parent 8050acf0
......@@ -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.2.4
<br /> Version 4.3.1
</h1>
<p style="text-align: center">Semantic Personal Publishing Platform</p>
......
This diff is collapsed.
......@@ -56,15 +56,18 @@ $core_actions_post = array(
'hidden-columns', 'update-welcome-panel', 'menu-get-metabox', 'wp-link-ajax',
'menu-locations-save', 'menu-quick-search', 'meta-box-order', 'get-permalink',
'sample-permalink', 'inline-save', 'inline-save-tax', 'find_posts', 'widgets-order',
'save-widget', 'set-post-thumbnail', 'date_format', 'time_format', 'wp-fullscreen-save-post',
'save-widget', 'set-post-thumbnail', 'date_format', 'time_format',
'wp-remove-post-lock', 'dismiss-wp-pointer', 'upload-attachment', 'get-attachment',
'query-attachments', 'save-attachment', 'save-attachment-compat', 'send-link-to-editor',
'send-attachment-to-editor', 'save-attachment-order', 'heartbeat', 'get-revision-diffs',
'save-user-color-scheme', 'update-widget', 'query-themes', 'parse-embed', 'set-attachment-thumbnail',
'parse-media-shortcode', 'destroy-sessions', 'install-plugin', 'update-plugin', 'press-this-save-post',
'press-this-add-category',
'press-this-add-category', 'crop-image',
);
// Deprecated
$core_actions_post[] = 'wp-fullscreen-save-post';
// Register core Ajax calls.
if ( ! empty( $_GET['action'] ) && in_array( $_GET['action'], $core_actions_get ) )
add_action( 'wp_ajax_' . $_GET['action'], 'wp_ajax_' . str_replace( '-', '_', $_GET['action'] ), 1 );
......
......@@ -81,6 +81,7 @@ do_action( 'admin_print_footer_scripts' );
*
* @since 2.8.0
*
* @global string $hook_suffix
* @param string $hook_suffix The current admin page.
*/
do_action( "admin_footer-" . $GLOBALS['hook_suffix'] );
......
......@@ -10,7 +10,19 @@
if ( ! defined( 'WP_ADMIN' ) )
require_once( dirname( __FILE__ ) . '/admin.php' );
// In case admin-header.php is included in a function.
/**
* In case admin-header.php is included in a function.
*
* @global string $title
* @global string $hook_suffix
* @global WP_Screen $current_screen
* @global WP_Locale $wp_locale
* @global string $pagenow
* @global string $wp_version
* @global string $update_title
* @global int $total_update_count
* @global string $parent_file
*/
global $title, $hook_suffix, $current_screen, $wp_locale, $pagenow, $wp_version,
$update_title, $total_update_count, $parent_file;
......@@ -24,7 +36,7 @@ $title = esc_html( strip_tags( $title ) );
if ( is_network_admin() )
$admin_title = sprintf( __( 'Network Admin: %s' ), esc_html( get_current_site()->site_name ) );
elseif ( is_user_admin() )
$admin_title = sprintf( __( 'Global Dashboard: %s' ), esc_html( get_current_site()->site_name ) );
$admin_title = sprintf( __( 'User Dashboard: %s' ), esc_html( get_current_site()->site_name ) );
else
$admin_title = get_bloginfo( 'name' );
......
......@@ -94,11 +94,21 @@ $time_format = get_option('time_format');
wp_enqueue_script( 'common' );
// $pagenow is set in vars.php
// $wp_importers is sometimes set in wp-admin/includes/import.php
//
// The remaining variables are imported as globals elsewhere,
// declared as globals here
/**
* $pagenow is set in vars.php
* $wp_importers is sometimes set in wp-admin/includes/import.php
* The remaining variables are imported as globals elsewhere, declared as globals here
*
* @global string $pagenow
* @global array $wp_importers
* @global string $hook_suffix
* @global string $plugin_page
* @global string $typenow
* @global string $taxnow
*/
global $pagenow, $wp_importers, $hook_suffix, $plugin_page, $typenow, $taxnow;
$page_hook = null;
......
......@@ -12,6 +12,9 @@ require_once( dirname( __FILE__ ) . '/admin.php' );
$parent_file = 'edit-comments.php';
$submenu_file = 'edit-comments.php';
/**
* @global string $action
*/
global $action;
wp_reset_vars( array('action') );
......@@ -66,7 +69,7 @@ case 'editcomment' :
$comment_id = absint( $_GET['c'] );
if ( !$comment = get_comment( $comment_id ) )
comment_footer_die( __('Oops, no comment with this ID.') . sprintf(' <a href="%s">' . __('Go back') . '</a>.', 'javascript:history.go(-1)') );
comment_footer_die( __( 'Invalid comment ID.' ) . sprintf(' <a href="%s">' . __('Go back') . '</a>.', 'javascript:history.go(-1)') );
if ( !current_user_can( 'edit_comment', $comment_id ) )
comment_footer_die( __('You are not allowed to edit this comment.') );
......@@ -114,13 +117,13 @@ case 'spam' :
?>
<div class="wrap">
<h2><?php echo esc_html( $title ); ?></h2>
<h1><?php echo esc_html( $title ); ?></h1>
<?php
switch ( $action ) {
case 'spam' :
$caution_msg = __('You are about to mark the following comment as spam:');
$button = __('Mark as Spam');
$button = _x( 'Mark as Spam', 'comment' );
break;
case 'trash' :
$caution_msg = __('You are about to move the following comment to the Trash:');
......@@ -174,7 +177,7 @@ if ( $comment->comment_approved != '0' ) { // if not unapproved
</tr>
<?php } ?>
<tr>
<th scope="row"><?php _e( 'In Response To' ); ?></th>
<th scope="row"><?php /* translators: column name or table row header */ _e( 'In Response To' ); ?></th>
<td>
<?php
$post_id = $comment->comment_post_ID;
......@@ -249,7 +252,7 @@ case 'unapprovecomment' :
$noredir = isset($_REQUEST['noredir']);
if ( !$comment = get_comment($comment_id) )
comment_footer_die( __('Oops, no comment with this ID.') . sprintf(' <a href="%s">' . __('Go back') . '</a>.', 'edit-comments.php') );
comment_footer_die( __( 'Invalid comment ID.' ) . sprintf(' <a href="%s">' . __('Go back') . '</a>.', 'edit-comments.php') );
if ( !current_user_can( 'edit_comment', $comment->comment_ID ) )
comment_footer_die( __('You are not allowed to edit comments on this post.') );
......
......@@ -18,7 +18,7 @@ $title = __( 'Credits' );
*
* @since 3.2.0
*
* @return array|bool A list of all of the contributors, or false on error.
* @return array|false A list of all of the contributors, or false on error.
*/
function wp_credits() {
global $wp_version;
......@@ -55,7 +55,6 @@ function wp_credits() {
* @param string &$display_name The contributor's display name, passed by reference.
* @param string $username The contributor's username.
* @param string $profiles URL to the contributor's WordPress.org profile page.
* @return string A contributor's display name, hyperlinked to a WordPress.org profile page.
*/
function _wp_credits_add_profile_link( &$display_name, $username, $profiles ) {
$display_name = '<a href="' . esc_url( sprintf( $profiles, $username ) ) . '">' . esc_html( $display_name ) . '</a>';
......@@ -68,10 +67,9 @@ function _wp_credits_add_profile_link( &$display_name, $username, $profiles ) {
* @since 3.2.0
*
* @param string &$data External library data, passed by reference.
* @return string Link to the external library.
*/
function _wp_credits_build_object_link( &$data ) {
$data = '<a href="' . esc_url( $data[1] ) . '">' . $data[0] . '</a>';
$data = '<a href="' . esc_url( $data[1] ) . '">' . esc_html( $data[0] ) . '</a>';
}
list( $display_version ) = explode( '-', $wp_version );
......@@ -82,7 +80,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
<h1><?php printf( __( 'Welcome to WordPress %s' ), $display_version ); ?></h1>
<div class="about-text"><?php printf( __( 'Thank you for updating! WordPress %s helps you communicate and share, globally.' ), $display_version ); ?></div>
<div class="about-text"><?php printf( __( 'Thank you for updating! WordPress %s makes it even easier to format your content and customize your site.' ), $display_version ); ?></div>
<div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>
......@@ -111,8 +109,6 @@ if ( ! $credits ) {
echo '<p class="about-description">' . __( 'WordPress is created by a worldwide team of passionate individuals.' ) . "</p>\n";
$gravatar = is_ssl() ? 'https://secure.gravatar.com/avatar/' : 'http://0.gravatar.com/avatar/';
foreach ( $credits['groups'] as $group_slug => $group_data ) {
if ( $group_data['name'] ) {
if ( 'Translators' == $group_data['name'] ) {
......@@ -124,7 +120,7 @@ foreach ( $credits['groups'] as $group_slug => $group_data ) {
$title = translate( $group_data['name'] );
}
echo '<h4 class="wp-people-group">' . $title . "</h4>\n";
echo '<h4 class="wp-people-group">' . esc_html( $title ) . "</h4>\n";
}
if ( ! empty( $group_data['shuffle'] ) )
......@@ -144,11 +140,14 @@ foreach ( $credits['groups'] as $group_slug => $group_data ) {
$classes = 'wp-people-group ' . ( $compact ? 'compact' : '' );
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-' . $person_data[2] . '">' . "\n\t";
echo '<a href="' . sprintf( $credits['data']['profiles'], $person_data[2] ) . '">';
$size = 'compact' == $group_data['type'] ? '30' : '60';
echo '<img src="' . $gravatar . $person_data[1] . '?s=' . $size . '" srcset="' . $gravatar . $person_data[1] . '?s=' . $size * 2 . ' 2x" class="gravatar" alt="' . esc_attr( $person_data[0] ) . '" /></a>' . "\n\t";
echo '<a class="web" href="' . sprintf( $credits['data']['profiles'], $person_data[2] ) . '">' . $person_data[0] . "</a>\n\t";
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] ) ) . '">';
$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";
if ( ! $compact )
echo '<span class="title">' . translate( $person_data[3] ) . "</span>\n";
echo "</li>\n";
......
......@@ -23,7 +23,8 @@
}
.about-wrap div.updated,
.about-wrap div.error {
.about-wrap div.error,
.about-wrap .notice {
display: none !important;
}
......@@ -41,6 +42,10 @@
vertical-align: middle;
}
.about-wrap .jetpack-video-wrapper {
margin-bottom: 0;
}
/* WordPress Version Badge */
.wp-badge {
......@@ -96,6 +101,7 @@
.about-wrap h1 {
margin: 0.2em 0 0 200px;
padding: 0;
color: #32373c;
line-height: 1.2em;
font-size: 2.8em;
......@@ -115,6 +121,7 @@
.about-wrap code,
.about-wrap ol li p {
font-size: 14px;
font-weight: normal;
}
.about-wrap .about-description,
......@@ -133,21 +140,22 @@
/* 1.2 - Structure */
.about-wrap .two-col > div {
.about-wrap [class$=col] .col {
float: right;
position: relative;
width: 47.6%;
}
.about-wrap .two-col .col {
margin-left: 4.799999999%;
float: right;
width: 47.6%;
}
.about-wrap .three-col > div {
position: relative;
width: 29.95%;
.about-wrap .three-col .col {
margin-left: 4.999999999%;
float: right;
width: 29.95%;
}
.about-wrap [class$=col] .last-feature {
.about-wrap .two-col .col:nth-of-type(2n),
.about-wrap .three-col .col:nth-of-type(3n) {
margin-left: 0;
}
......@@ -233,23 +241,30 @@
max-width: 95%;
}
.about-wrap .feature-section .col:nth-of-type(odd) {
float: right;
margin: 40px 0 0 5%;
width: 48%;
.about-wrap .feature-section .media-container {
border: 1px solid #ddd;
overflow: hidden;
}
.about-wrap .feature-section .svg-container {
padding: 50px 0;
text-align: center;
background-color: #e1e1e3;
}
.about-wrap .feature-section .col:nth-of-type(even) {
float: left;
margin: 40px 0 0;
width: 46%;
.about-wrap .feature-section .svg-container img {
max-width: 150px;
}
.about-wrap .feature-section:not(.under-the-hood) .col {
margin-top: 40px;
}
.about-wrap .changelog {
margin-bottom: 40px;
}
.about-wrap .changelog.feature-section > div {
.about-wrap .changelog.feature-section .col {
margin-top: 40px;
}
......@@ -364,26 +379,20 @@
border-bottom: none;
}
.about-wrap .one-col > div,
.about-wrap .two-col > div,
.about-wrap .three-col > div,
.about-wrap .two-col .col:nth-of-type(n) {
.about-wrap [class$=col] .col {
float: none;
width: 100%;
margin: 40px 0 0;
padding: 0 0 40px;
border-bottom: 1px solid rgba(0, 0, 0, 0.1);
}
.about-wrap .two-col .col h3 {
margin-top: 0;
}
.about-wrap .three-col img {
display: block;
margin: 0 auto;
}
.about-wrap .feature-list div {
.about-wrap .feature-list .col {
margin: 0;
padding: 0;
border-bottom: none;
......@@ -430,14 +439,15 @@
border-bottom: 1px solid #ccc;
}
.about-wrap .three-col div,
.about-wrap .headline-feature .feature-section div {
width: 100% !important;
float: none !important;
.about-wrap .feature-section .svg-container {
padding-top: 20px;
padding-bottom: 20px;
}
.about-wrap .dfw p {
max-width: 90%;
.about-wrap .three-col .col,
.about-wrap .headline-feature .feature-section .col {
width: 100% !important;
float: none !important;
}
}
......
......@@ -23,7 +23,8 @@
}
.about-wrap div.updated,
.about-wrap div.error {
.about-wrap div.error,
.about-wrap .notice {
display: none !important;
}
......@@ -41,6 +42,10 @@
vertical-align: middle;
}
.about-wrap .jetpack-video-wrapper {
margin-bottom: 0;
}
/* WordPress Version Badge */
.wp-badge {
......@@ -96,6 +101,7 @@
.about-wrap h1 {
margin: 0.2em 200px 0 0;
padding: 0;
color: #32373c;
line-height: 1.2em;
font-size: 2.8em;
......@@ -115,6 +121,7 @@
.about-wrap code,
.about-wrap ol li p {
font-size: 14px;
font-weight: normal;
}
.about-wrap .about-description,
......@@ -133,21 +140,22 @@
/* 1.2 - Structure */
.about-wrap .two-col > div {
.about-wrap [class$=col] .col {
float: left;
position: relative;
width: 47.6%;
}
.about-wrap .two-col .col {
margin-right: 4.799999999%;
float: left;
width: 47.6%;
}
.about-wrap .three-col > div {
position: relative;
width: 29.95%;
.about-wrap .three-col .col {
margin-right: 4.999999999%;
float: left;
width: 29.95%;
}
.about-wrap [class$=col] .last-feature {
.about-wrap .two-col .col:nth-of-type(2n),
.about-wrap .three-col .col:nth-of-type(3n) {
margin-right: 0;
}
......@@ -233,23 +241,30 @@
max-width: 95%;
}
.about-wrap .feature-section .col:nth-of-type(odd) {
float: left;
margin: 40px 5% 0 0;
width: 48%;
.about-wrap .feature-section .media-container {
border: 1px solid #ddd;
overflow: hidden;
}
.about-wrap .feature-section .svg-container {
padding: 50px 0;
text-align: center;
background-color: #e1e1e3;
}
.about-wrap .feature-section .col:nth-of-type(even) {
float: right;
margin: 40px 0 0;
width: 46%;
.about-wrap .feature-section .svg-container img {
max-width: 150px;
}
.about-wrap .feature-section:not(.under-the-hood) .col {
margin-top: 40px;
}
.about-wrap .changelog {
margin-bottom: 40px;
}
.about-wrap .changelog.feature-section > div {
.about-wrap .changelog.feature-section .col {
margin-top: 40px;
}
......@@ -364,26 +379,20 @@
border-bottom: none;
}
.about-wrap .one-col > div,
.about-wrap .two-col > div,
.about-wrap .three-col > div,
.about-wrap .two-col .col:nth-of-type(n) {
.about-wrap [class$=col] .col {
float: none;
width: 100%;