Commit 6580b6b9 authored by lucha's avatar lucha

Upgrade Wordpress 4.7

parent a23b8868
......@@ -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.6.1
<br /> Version 4.7
</h1>
<p style="text-align: center">Semantic Personal Publishing Platform</p>
......@@ -59,9 +59,10 @@
<h3>Recommendations</h3>
<ul>
<li><a href="https://secure.php.net/">PHP</a> version <strong>5.6</strong> or higher.</li>
<li><a href="https://secure.php.net/">PHP</a> version <strong>7</strong> or higher.</li>
<li><a href="https://www.mysql.com/">MySQL</a> version <strong>5.6</strong> or higher.</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>
</ul>
......
......@@ -125,7 +125,7 @@ get_header( 'wp-activate' );
<?php
}
} else {
$url = isset( $result['blog_id'] ) ? get_blogaddress_by_id( (int) $result['blog_id'] ) : '';
$url = isset( $result['blog_id'] ) ? get_home_url( (int) $result['blog_id'] ) : '';
$user = get_userdata( (int) $result['user_id'] );
?>
<h2><?php _e('Your account is now active!'); ?></h2>
......
This diff is collapsed.
......@@ -83,7 +83,7 @@ do_action( 'admin_footer', '' );
*
* @param string $hook_suffix The current admin page.
*/
do_action( "admin_print_footer_scripts-$hook_suffix" );
do_action( "admin_print_footer_scripts-{$hook_suffix}" );
/**
* Prints any scripts and data queued for the footer.
......@@ -103,7 +103,7 @@ do_action( 'admin_print_footer_scripts' );
* @global string $hook_suffix
* @param string $hook_suffix The current admin page.
*/
do_action( "admin_footer-$hook_suffix" );
do_action( "admin_footer-{$hook_suffix}" );
// get_site_option() won't exist when auto upgrading from <= 2.7
if ( function_exists('get_site_option') ) {
......
......@@ -18,12 +18,11 @@ if ( ! defined( 'WP_ADMIN' ) )
* @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,
global $title, $hook_suffix, $current_screen, $wp_locale, $pagenow,
$update_title, $total_update_count, $parent_file;
// Catch plugins that include admin-header.php before admin.php completes.
......@@ -33,17 +32,23 @@ if ( empty( $current_screen ) )
get_admin_page_title();
$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( __( 'User Dashboard: %s' ), esc_html( get_current_site()->site_name ) );
else
if ( is_network_admin() ) {
/* translators: Network admin screen title. 1: Network name */
$admin_title = sprintf( __( 'Network Admin: %s' ), esc_html( get_network()->site_name ) );
} elseif ( is_user_admin() ) {
/* translators: User dashboard screen title. 1: Network name */
$admin_title = sprintf( __( 'User Dashboard: %s' ), esc_html( get_network()->site_name ) );
} else {
$admin_title = get_bloginfo( 'name' );
}
if ( $admin_title == $title )
if ( $admin_title == $title ) {
/* translators: Admin screen title. 1: Admin screen name */
$admin_title = sprintf( __( '%1$s &#8212; WordPress' ), $title );
else
} else {
/* translators: Admin screen title. 1: Admin screen name, 2: Network or site name */
$admin_title = sprintf( __( '%1$s &lsaquo; %2$s &#8212; WordPress' ), $title, $admin_title );
}
/**
* Filters the title tag content for an admin page.
......@@ -96,7 +101,7 @@ do_action( 'admin_enqueue_scripts', $hook_suffix );
*
* @since 2.6.0
*/
do_action( "admin_print_styles-$hook_suffix" );
do_action( "admin_print_styles-{$hook_suffix}" );
/**
* Fires when styles are printed for all admin pages.
......@@ -110,7 +115,7 @@ do_action( 'admin_print_styles' );
*
* @since 2.1.0
*/
do_action( "admin_print_scripts-$hook_suffix" );
do_action( "admin_print_scripts-{$hook_suffix}" );
/**
* Fires when scripts are printed for all admin pages.
......@@ -127,7 +132,7 @@ do_action( 'admin_print_scripts' );
*
* @since 2.1.0
*/
do_action( "admin_head-$hook_suffix" );
do_action( "admin_head-{$hook_suffix}" );
/**
* Fires in head section for all admin pages.
......@@ -154,10 +159,10 @@ if ( $current_screen->post_type )
if ( $current_screen->taxonomy )
$admin_body_class .= ' taxonomy-' . $current_screen->taxonomy;
$admin_body_class .= ' branch-' . str_replace( array( '.', ',' ), '-', floatval( $wp_version ) );
$admin_body_class .= ' version-' . str_replace( '.', '-', preg_replace( '/^([.0-9]+).*/', '$1', $wp_version ) );
$admin_body_class .= ' branch-' . str_replace( array( '.', ',' ), '-', floatval( get_bloginfo( 'version' ) ) );
$admin_body_class .= ' version-' . str_replace( '.', '-', preg_replace( '/^([.0-9]+).*/', '$1', get_bloginfo( 'version' ) ) );
$admin_body_class .= ' admin-color-' . sanitize_html_class( get_user_option( 'admin_color' ), 'fresh' );
$admin_body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_locale() ) ) );
$admin_body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_user_locale() ) ) );
if ( wp_is_mobile() )
$admin_body_class .= ' mobile';
......
......@@ -209,7 +209,7 @@ if ( isset($plugin_page) ) {
*
* @since 2.1.0
*/
do_action( 'load-' . $page_hook );
do_action( "load-{$page_hook}" );
if (! isset($_GET['noheader']))
require_once(ABSPATH . 'wp-admin/admin-header.php');
......@@ -239,7 +239,7 @@ if ( isset($plugin_page) ) {
*
* @since 1.5.0
*/
do_action( 'load-' . $plugin_page );
do_action( "load-{$plugin_page}" );
if ( !isset($_GET['noheader']))
require_once(ABSPATH . 'wp-admin/admin-header.php');
......@@ -278,7 +278,7 @@ if ( isset($plugin_page) ) {
*
* @since 3.5.0
*/
do_action( 'load-importer-' . $importer );
do_action( "load-importer-{$importer}" );
$parent_file = 'tools.php';
$submenu_file = 'import.php';
......@@ -326,7 +326,7 @@ if ( isset($plugin_page) ) {
*
* @since 2.1.0
*/
do_action( 'load-' . $pagenow );
do_action( "load-{$pagenow}" );
/*
* The following hooks are fired to ensure backward compatibility.
......
......@@ -48,8 +48,8 @@ case 'editcomment' :
get_current_screen()->set_help_sidebar(
'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
'<p>' . __( '<a href="https://codex.wordpress.org/Administration_Screens#Comments" target="_blank">Documentation on Comments</a>' ) . '</p>' .
'<p>' . __( '<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>' ) . '</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>'
);
wp_enqueue_script('comment');
......@@ -213,7 +213,7 @@ if ( $comment->comment_approved != '0' ) { // if not unapproved
<th scope="row"><?php /* translators: field name in comment form */ _ex('Comment', 'noun'); ?></th>
<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>
<p class="edit-comment"><a href="<?php echo admin_url( "comment.php?action=editcomment&amp;c={$comment->comment_ID}" ); ?>"><?php esc_html_e( 'Edit' ); ?></a></p>
</td>
</tr>
</table>
......@@ -222,7 +222,7 @@ if ( $comment->comment_approved != '0' ) { // if not unapproved
<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>
<a href="<?php echo admin_url('edit-comments.php'); ?>" class="button-cancel"><?php esc_html_e( 'Cancel' ); ?></a>
</p>
<?php wp_nonce_field( $nonce_action ); ?>
......
......@@ -12,7 +12,7 @@ require_once( dirname( __FILE__ ) . '/includes/credits.php' );
$title = __( 'Credits' );
list( $display_version ) = explode( '-', $wp_version );
list( $display_version ) = explode( '-', get_bloginfo( 'version' ) );
include( ABSPATH . 'wp-admin/admin-header.php' );
?>
......@@ -20,7 +20,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
<h1><?php printf( __( 'Welcome to WordPress %s' ), $display_version ); ?></h1>
<p class="about-text"><?php printf( __( 'Thank you for updating to the latest version. WordPress %s changes a lot behind the scenes to make your WordPress experience even better!' ), $display_version ); ?></p>
<p class="about-text"><?php printf( __( 'Thank you for updating to the latest version! WordPress %s helps you get your site set up the way you want it.' ), $display_version ); ?></p>
<div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>
......
......@@ -40,6 +40,7 @@
max-width: 100%;
height: auto;
vertical-align: middle;
border: 1px solid rgba(0, 0, 0, 0.1);
}
.about-wrap .jetpack-video-wrapper {
......@@ -93,7 +94,7 @@
}
.about-wrap .feature-section p {
max-width: 38em;
max-width: 55em;
margin-right: auto;
margin-left: auto;
}
......@@ -108,8 +109,8 @@
}
.about-wrap h2 {
margin: 50px 0 1em;
font-size: 1.8em;
margin: 40px 0 .6em;
font-size: 2.7em;
line-height: 1.3;
font-weight: 300;
text-align: center;
......@@ -117,7 +118,7 @@
.about-wrap h3 {
margin: 1.25em 0 .6em;
font-size: 1.25em;
font-size: 1.4em;
line-height: 1.5;
}
......@@ -125,6 +126,12 @@
color: #23282d;
}
.about-wrap .changelog h2 {
font-size: 1.4em;
font-weight: 600;
text-align: right;
}
.about-wrap .changelog h3 {
margin: 1.33em 0;
font-size: 1em;
......@@ -193,11 +200,6 @@
overflow: hidden;
}
.about-wrap .under-the-hood:nth-of-type(2n),
.about-wrap .under-the-hood:nth-of-type(3n) {
margin-top: 3em;
}
.about-wrap .feature-video .mejs-controls {
display: none !important;
}
......@@ -227,19 +229,6 @@
/* 2.1 - Typography */
.about-wrap .headline-feature h2 {
margin: 30px 0 30px;
font-size: 2.2em;
font-weight: 300;
line-height: 1.3;
text-align: center;
}
.about-wrap .headline-feature h3 {
margin-top: 0;
text-align: right;
}
.about-wrap .feature-section.two-col h3 {
margin-top: 0;
}
......@@ -253,6 +242,11 @@
margin-top: 0.6em;
}
.about-wrap .lead-description {
font-size: 1.5em;
text-align: center;
}
.about-wrap .two-col-text {
-webkit-column-count: 2;
-moz-column-count: 2;
......@@ -300,6 +294,10 @@
padding: 0 0 40px;
}
.about-wrap .feature-section.no-heading {
padding-top: 35px;
}
.about-wrap .headline-feature {
margin: 0 auto;
max-width: 80%;
......@@ -309,6 +307,10 @@
overflow: hidden;
}
.about-wrap .feature-section img {
margin-bottom: 1em;
}
.about-wrap .embed-container {
text-align: center;
}
......
This diff is collapsed.
......@@ -40,6 +40,7 @@
max-width: 100%;
height: auto;
vertical-align: middle;
border: 1px solid rgba(0, 0, 0, 0.1);
}
.about-wrap .jetpack-video-wrapper {
......@@ -93,7 +94,7 @@
}
.about-wrap .feature-section p {
max-width: 38em;
max-width: 55em;
margin-left: auto;
margin-right: auto;
}
......@@ -108,8 +109,8 @@
}
.about-wrap h2 {
margin: 50px 0 1em;
font-size: 1.8em;
margin: 40px 0 .6em;
font-size: 2.7em;
line-height: 1.3;
font-weight: 300;
text-align: center;
......@@ -117,7 +118,7 @@
.about-wrap h3 {
margin: 1.25em 0 .6em;
font-size: 1.25em;
font-size: 1.4em;
line-height: 1.5;
}
......@@ -125,6 +126,12 @@
color: #23282d;
}
.about-wrap .changelog h2 {
font-size: 1.4em;
font-weight: 600;
text-align: left;
}
.about-wrap .changelog h3 {
margin: 1.33em 0;
font-size: 1em;
......@@ -193,11 +200,6 @@
overflow: hidden;
}
.about-wrap .under-the-hood:nth-of-type(2n),
.about-wrap .under-the-hood:nth-of-type(3n) {
margin-top: 3em;
}
.about-wrap .feature-video .mejs-controls {
display: none !important;
}
......@@ -227,19 +229,6 @@
/* 2.1 - Typography */
.about-wrap .headline-feature h2 {
margin: 30px 0 30px;
font-size: 2.2em;
font-weight: 300;
line-height: 1.3;
text-align: center;
}
.about-wrap .headline-feature h3 {
margin-top: 0;
text-align: left;
}
.about-wrap .feature-section.two-col h3 {
margin-top: 0;
}
......@@ -253,6 +242,11 @@
margin-top: 0.6em;
}
.about-wrap .lead-description {
font-size: 1.5em;
text-align: center;
}
.about-wrap .two-col-text {
-webkit-column-count: 2;
-moz-column-count: 2;
......@@ -300,6 +294,10 @@
padding: 0 0 40px;
}
.about-wrap .feature-section.no-heading {
padding-top: 35px;
}
.about-wrap .headline-feature {
margin: 0 auto;
max-width: 80%;
......@@ -309,6 +307,10 @@
overflow: hidden;
}
.about-wrap .feature-section img {
margin-bottom: 1em;
}
.about-wrap .embed-container {
text-align: center;
}
......
This diff is collapsed.
......@@ -264,7 +264,7 @@
.folded #adminmenu .wp-has-current-submenu.opensub .wp-submenu,
.folded #adminmenu a.menu-top:focus + .wp-submenu,
.folded #adminmenu .wp-has-current-submenu a.menu-top:focus + .wp-submenu,
.no-js.folded #adminmenu .wp-has-submenu:hover .wp-submenu {
.no-js.folded #adminmenu .wp-has-submenu:hover .wp-submenu {
top: 0;
right: 36px;
}
......@@ -547,79 +547,82 @@ ul#adminmenu > li.current > a.current:after {
display: none;
}
#collapse-menu {
font-size: 13px;
#collapse-button {
display: block;
width: 100%;
height: 34px;
margin: 0;
border: none;
padding: 0;
position: relative;
overflow: visible;
line-height: 34px;
<